diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..a75febd 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -89,9 +89,11 @@
   taxNumber: string // 税号
   website: string //	网址
   traceSupplierPersonList: traceSupplierPerson [] // 溯源供方人员列表
-  taskId?: '' // 任务id, 流程审批用
+  taskId?: string // 任务id, 流程审批用
+  processId?: string // 流程实例id
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +110,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..a75febd 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -89,9 +89,11 @@
   taxNumber: string // 税号
   website: string //	网址
   traceSupplierPersonList: traceSupplierPerson [] // 溯源供方人员列表
-  taskId?: '' // 任务id, 流程审批用
+  taskId?: string // 任务id, 流程审批用
+  processId?: string // 流程实例id
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +110,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index aa181ed..3861f14 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -158,7 +158,7 @@
     processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
-  workFlowStore.setIsTried(true)
+  // workFlowStore.setIsTried(true)
   tipList.value = []
   reErr(processConfig.value.nodeConfig) // 统计空节点
   if (tipList.value.length != 0) { // 存在空节点

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..a75febd 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -89,9 +89,11 @@
   taxNumber: string // 税号
   website: string //	网址
   traceSupplierPersonList: traceSupplierPerson [] // 溯源供方人员列表
-  taskId?: '' // 任务id, 流程审批用
+  taskId?: string // 任务id, 流程审批用
+  processId?: string // 流程实例id
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +110,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index aa181ed..3861f14 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -158,7 +158,7 @@
     processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
-  workFlowStore.setIsTried(true)
+  // workFlowStore.setIsTried(true)
   tipList.value = []
   reErr(processConfig.value.nodeConfig) // 统计空节点
   if (tipList.value.length != 0) { // 存在空节点
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index daadd9b..ef78067 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -158,7 +158,7 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="签名编号" prop="signNo">
             <el-input v-model.trim="ruleForm.signNo" placeholder="系统自动生成" disabled />
@@ -189,12 +189,17 @@
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
+      </el-form-item> -->
+      <el-form-item label="签名人员" prop="userIdList">
+        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..a75febd 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -89,9 +89,11 @@
   taxNumber: string // 税号
   website: string //	网址
   traceSupplierPersonList: traceSupplierPerson [] // 溯源供方人员列表
-  taskId?: '' // 任务id, 流程审批用
+  taskId?: string // 任务id, 流程审批用
+  processId?: string // 流程实例id
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +110,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index aa181ed..3861f14 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -158,7 +158,7 @@
     processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
-  workFlowStore.setIsTried(true)
+  // workFlowStore.setIsTried(true)
   tipList.value = []
   reErr(processConfig.value.nodeConfig) // 统计空节点
   if (tipList.value.length != 0) { // 存在空节点
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index daadd9b..ef78067 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -158,7 +158,7 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="签名编号" prop="signNo">
             <el-input v-model.trim="ruleForm.signNo" placeholder="系统自动生成" disabled />
@@ -189,12 +189,17 @@
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
+      </el-form-item> -->
+      <el-form-item label="签名人员" prop="userIdList">
+        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 0fdec28..e56f293 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +24,19 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
-} // 获取可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
+// const getuser = () => {
+//   getUserList({ offset: 1, limit: 99999 }).then((res) => {
+//     userList.value = res.data.rows
+//   })
+// }
+// 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,7 +45,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,16 +62,16 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
+      // res.data.userList.forEach((element: userType) => {
+      //   ruleForm.userIdList?.push(element.id)
+      // })
     })
     // 修改
   }
@@ -81,14 +82,14 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -184,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->

diff --git a/src/api/approval.ts b/src/api/approval.ts
index cb8a9af..88ff0a5 100644
--- a/src/api/approval.ts
+++ b/src/api/approval.ts
@@ -4,16 +4,24 @@
   agree: '/approval/operate/agree',
   refuse: '/approval/operate/refuse',
   reject: '/approval/operate/reject',
-  revoke: '/approval/operate/revoke',
 }
 // 审批操作接口
-export function submitApproval(type: string, data: { taskId: string; comments: string }) {
+export function submitApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
   return request({
     url: approvalType[type],
     method: 'post',
     data,
   })
 }
+
+// 取消审批
+export function cancelApproval(data: { processId?: string; comments: string }) {
+  return request({
+    url: '/approval/operate/revoke',
+    method: 'post',
+    data,
+  })
+}
 // 查询审批记录
 export function fetchApproval(processId: string) {
   return request({
diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
deleted file mode 100644
index e69de29..0000000
--- a/src/api/business/order/order.ts
+++ /dev/null
diff --git a/src/api/business/schedule/order.ts b/src/api/business/schedule/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/schedule/order.ts
diff --git a/src/api/customer/bench.ts b/src/api/customer/bench.ts
index 4809b3c..ca7d608 100644
--- a/src/api/customer/bench.ts
+++ b/src/api/customer/bench.ts
@@ -3,12 +3,12 @@
  */
 import request from '../index'
 // import type { ICustomerQuery } from '@/views/customer/customerInfo/customer_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 样品新增趋势
 export function getSampleAddData() {
   return request({
-    url: `${prefix}/workbench/querySampleAddData`,
+    url: `${prefix}/workbench/sample/increaseTrend`,
     method: 'post',
   })
 }
@@ -16,15 +16,15 @@
 // 样品到期趋势
 export function getSampleExpireData() {
   return request({
-    url: `${prefix}/workbench/querySampleExpireData`,
+    url: `${prefix}/workbench/sample/expireTrend`,
     method: 'post',
   })
 }
 
-// 样品到期趋势
+// 客户新增趋势
 export function getCustomerExpireData() {
   return request({
-    url: `${prefix}/workbench/queryCustomerAddData`,
+    url: `${prefix}/workbench/increaseTrend`,
     method: 'post',
   })
 }
@@ -32,7 +32,7 @@
 // 优质客户名单
 export function getHighQualityCustomerList() {
   return request({
-    url: `${prefix}/workbench/gethighQualityCustomerList`,
+    url: `${prefix}/workbench/excellentList`,
     method: 'post',
   })
 }
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index fb50c25..3ac7392 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -3,7 +3,7 @@
  */
 import request from '../index'
 import type { ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface'
-const prefix = '/meter'
+const prefix = '/customer'
 
 // 列表查询
 export function getSampleList(data: ISampleListQuery) {
diff --git a/src/api/device/receive.ts b/src/api/device/receive.ts
new file mode 100644
index 0000000..da7ac90
--- /dev/null
+++ b/src/api/device/receive.ts
@@ -0,0 +1,82 @@
+/**
+ * 设备领用接口
+ */
+import request from '../index'
+import type{ IlistQuery } from '@/views/device/receive/receive'
+const prefix = '/equipmentApply'
+
+/**
+ * ----------------------------------设备领用申请----------------------------------
+ */
+
+// 列表
+export function getReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/equipmentApplyList?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 列表导出
+export function exportReceiveApplyList(data: IlistQuery) {
+  return request({
+    url: `${prefix}/exportList`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 列表删除
+export function delReceiveApplyList(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/deleteEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 新建--点击保存
+export function saveAddReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/addEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+// 新建--提交
+export function submitReceiveApplyList(data: { formId: string; id: string }) {
+  return request({
+    url: `${prefix}/submitEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑--保存
+export function saveEditReceiveApplyList(data: { applyUnit: string; applyPerson: string; time: string ;applyDesc: string; applyType: string; equipmentList: { equipmentId: string }[] }) {
+  return request({
+    url: `${prefix}/updateEquipmentApply`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情
+export function getReceiveApplyListDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/equipmentApplyInfo`,
+    method: 'post',
+    data,
+  })
+}
+
+// 领用-退领
+export function updateProcessResult(data: { id: string; processResult: string }) {
+  return request({
+    url: `${prefix}/updateProcessResult`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
index 8b646b1..1c3ae09 100644
--- a/src/api/measure/source.ts
+++ b/src/api/measure/source.ts
@@ -63,10 +63,10 @@
     data,
   })
 }
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
+// 驳回后编辑接口
+export function updateSourceApproval(data: object) {
   return request({
-    url: `${prefix}/supplier/update`,
+    url: '/meter/supplier/failUpdate',
     method: 'post',
     data,
   })
diff --git a/src/components.d.ts b/src/components.d.ts
index abe6b8d..227585d 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,6 +12,7 @@
     AddressSelect: typeof import('./components/AddressSelect/AddressSelect.vue')['default']
     AppContainer: typeof import('./components/AppContainer/index.vue')['default']
     ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
+    ApprovalRecord: typeof import('./components/ApprovalRecord/ApprovalRecord.vue')['default']
     ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
     Auth: typeof import('./components/Auth/index.vue')['default']
     AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/ApprovalRecord/ApprovalRecord.vue b/src/components/ApprovalRecord/ApprovalRecord.vue
new file mode 100644
index 0000000..14040a2
--- /dev/null
+++ b/src/components/ApprovalRecord/ApprovalRecord.vue
@@ -0,0 +1,115 @@
+<!-- 审批流程组件 -->
+<script lang="ts" setup name="ApprovalRecord">
+import { onMounted } from 'vue'
+import { fetchApproval } from '@/api/approval'
+
+const props = defineProps({
+  processId: String, // 流程实例id
+})
+
+const approvalRecordData = [
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务ID',
+        data: 9,
+      },
+      {
+        name: '任务名称',
+        data: 'xxxx',
+      },
+    ],
+  },
+  {
+    finishTime: '2121-8-9',
+    tableData: [
+      {
+        name: '任务名称',
+        data: 'taskName',
+      },
+      {
+        name: '任务执行人',
+        data: 'assigneeName',
+      },
+      {
+        name: '部门名称',
+        data: 'deptName',
+      },
+      {
+        name: '意见类别',
+        data: 'type',
+      },
+      {
+        name: '意见内容',
+        data: 'comment',
+      },
+      {
+        name: '任务耗时',
+        data: 'duration',
+      },
+    ],
+  },
+]
+
+// 查询审批记录
+const getApprovalRecord = () => {
+  fetchApproval(props.processId!).then((res) => {
+    // 数据处理
+  })
+}
+
+// 自定义列背景色
+const columnStyle = ({ columnIndex }: { columnIndex: number }) => {
+  // 第一列颜色
+  if (columnIndex == 0) {
+    return {
+      backgroundColor: '#fafafa',
+    }
+  }
+  // 其他列颜色
+  else {
+    return {
+      backgroundColor: 'transparent',
+    }
+  }
+}
+
+onMounted(() => {
+  if (props.processId) {
+    getApprovalRecord()// 获取审批记录
+  }
+})
+</script>
+
+<template>
+  <el-timeline>
+    <el-timeline-item
+      v-for="(item, index) in approvalRecordData"
+      :key="index"
+      :timestamp="item.finishTime"
+      placement="top"
+      :type="index === approvalRecordData.length - 1 ? 'primary' : undefined"
+      :hollow="index === approvalRecordData.length - 1 ? true : false"
+      :size="index === approvalRecordData.length - 1 ? 'large' : 'normal'"
+    >
+      <el-card>
+        <el-table
+          :data="item.tableData"
+          :cell-style="columnStyle"
+          border
+          prop="name"
+          style="width: 100%;"
+          :show-header="false"
+        >
+          <el-table-column prop="name" label="参数名" />
+          <el-table-column prop="data" label="参数" />
+        </el-table>
+      </el-card>
+    </el-timeline-item>
+  </el-timeline>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/components/Sample/certificationRecords.vue b/src/components/Sample/certificationRecords.vue
index a694ce6..05e8d9d 100644
--- a/src/components/Sample/certificationRecords.vue
+++ b/src/components/Sample/certificationRecords.vue
@@ -10,7 +10,7 @@
   },
 })
 
-// 检定记录
+// 证书列表
 interface SimpleCertification {
   certificationCode: string // 证书编号
   certificationName: string // 证书形成
@@ -34,10 +34,6 @@
   { text: '证书有效期', value: 'expirationDate' },
 ])
 
-// 应出具证书数
-const requireCertifications = ref(0)
-// 当前证书数
-const currentCertifications = ref(0)
 // 证书列表
 const list = ref<SimpleCertification[]>([])
 const total = ref(0)
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 9a87d4b..cd478f1 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -24,7 +24,7 @@
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref()// 表格ref
 // 数据权限类型字典
-const dataScopeTypeDict = {
+const dataScopeTypeDict: { [key: number ]: string } = {
   1: '所有数据',
   2: '所属及下属部门',
   3: '本部门',
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 97d7326..b64df84 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -4,7 +4,7 @@
 import { ElMessage } from 'element-plus'
 import selectRoleDialog from '../dialog/selectRoleDialog.vue'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
-import $func from '@/plugins/preload.ts'
+import $func from '@/plugins/preload'
 import type { IEmployees, IroleInfo } from '@/components/dialog/dialog'
 
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -30,8 +30,8 @@
 }
 
 const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
-const decisionItem = ref(1) // 可选决策项
-const noticeStarter = ref(1) // 审批结果通知发起人
+const decisionItem = ref() // 可选决策项
+const noticeStarter = ref() // 审批结果通知发起人
 
 const visible = computed({
   get() {
@@ -41,7 +41,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.approverConfig1, (val: any) => {
+watch(() => workFlowStore.approverConfigValue, (val: any) => {
   approverConfig.value = val.value
 })
 
@@ -51,8 +51,8 @@
   approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
   approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
   approverConfig.value.noHanderAction = '' // 审批人为空时
-  approverConfig.value.directorLevel = 1 // 主管
-  approverConfig.value.examineEndDirectorLevel = 1 // 连续多级主管
+  approverConfig.value.directorLevel = '' // 主管
+  approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
 }
 // 添加成员
 const addApprover = () => {
@@ -141,13 +141,31 @@
     return
   }
 
+  console.log('pppppppp', decisionItem.value)
+
+  if (!`${decisionItem.value}` || isNaN(decisionItem.value)) {
+    ElMessage({
+      message: '请选择决策项',
+      type: 'warning',
+    })
+    return
+  }
+
+  if (!`${noticeStarter.value}` || isNaN(noticeStarter.value)) {
+    ElMessage({
+      message: '请选择审批结果是否通知发起人',
+      type: 'warning',
+    })
+    return
+  }
+
   // 把审批设置反应在流程图里面
   approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
   // 保存设置
   setApproverConfig({
     value: approverConfig.value,
     flag: true,
-    id: workFlowStore.approverConfig1.id,
+    id: workFlowStore.approverConfigValue.id,
   })
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index e93a591..3746fe7 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -1,27 +1,28 @@
 <!-- 条件设置 -->
-<script setup>
+<script setup lang="ts" name="ConsitionDrawer">
 import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
 import useWorkFlowStore from '@/store/modules/workFlow'
 
-const workFlowStore = useWorkFlowStore()
-const conditionVisible = ref(false)
-const conditionsConfig = ref({
+const workFlowStore = useWorkFlowStore() // store
+const conditionVisible = ref(false) // 控制选择条件对话框显隐
+const conditionsConfig = ref({ // 多个条件数据配置
   conditionNodes: [],
-})
-const conditionConfig = ref({})
-const PriorityLevel = ref('')
-const conditions = ref([])
-const conditionList = ref([])
-const checkedList = ref([])
-const conditionRoleVisible = ref(false)
-const checkedfqr = ref(true) // 条件-发起人是否选择
+}) as any
+const conditionConfig = ref({}) as any// 单个条件数据配置
+const PriorityLevel = ref() // 优先级
+const conditions = ref([]) as any // 条件选项（可以选择的条件）
+const conditionList = ref([]) as any// 条件列表
+const checkedList = ref([]) as any// 选择的人员
+const conditionRoleVisible = ref(false) // 条件选择人员对话框显隐
 
 const { setCondition, setConditionsConfig } = workFlowStore
 
-const closeDrawer = (val) => {
+// 关闭条件抽屉
+const closeDrawer = () => {
   setCondition(false)
 }
+// 监听控制条件抽屉显隐字段
 const visible = computed({
   get() {
     return workFlowStore.conditionDrawer
@@ -30,7 +31,9 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.conditionsConfig1, (val, oldVal) => {
+
+// 监听条件配置数据
+watch(() => workFlowStore.conditionsConfigValue, (val) => {
   conditionsConfig.value = val.value
   PriorityLevel.value = val.priorityLevel
   conditionConfig.value = val.priorityLevel
@@ -38,34 +41,11 @@
     : { nodeUserList: [], conditionList: [] }
 })
 
-const removeStrEle = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  let includesIndex
-  a.map((item, index) => {
-    if (item === key) {
-      includesIndex = index
-    }
-  })
-  a.splice(includesIndex, 1)
-  item.zdy1 = a.toString()
-}
-const toStrChecked = (item, key) => {
-  const a = item.zdy1 ? item.zdy1.split(',') : []
-  const isIncludes = $func.toggleStrClass(item, key)
-  if (!isIncludes) {
-    a.push(key)
-    item.zdy1 = a.toString()
-  }
-  else {
-    removeStrEle(item, key)
-  }
-}
-
-// 添加条件
+// 点击添加条件，弹出条件选择框
 const addCondition = async () => {
   conditionList.value = []
-  conditionVisible.value = true
-  const data = [
+  conditionVisible.value = true // 选择条件对话框显隐
+  const data = [ // 其他的条件选项
   //   // {
   //   //   "columnId": "1090",
   //   //   "showType": "1",
@@ -74,33 +54,15 @@
   //   //   "columnType": "Double",
   //   //   "fixedDownBoxValue": ""
   //   // },
-  //   // {
-  //   //   "columnId": "1092",
-  //   //   "showType": "3",
-  //   //   "showName": "采购类型",
-  //   //   "columnName": "procurementType",
-  //   //   "columnType": "String",
-  //   //   "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
-  //   // },
-  //   // {
-  //   //   "columnId": "1093",
-  //   //   "showType": "1",
-  //   //   "showName": "园区面积",
-  //   //   "columnName": "parkArea",
-  //   //   "columnType": "Double",
-  //   //   "fixedDownBoxValue": ""
-  //   // }
-  ]
-  conditions.value = data
+  ] as any
+  conditions.value = data // 条件选择项
   if (conditionConfig.value.conditionList) {
     for (let i = 0; i < conditionConfig.value.conditionList.length; i++) {
       var { columnId } = conditionConfig.value.conditionList[i]
+      // 条件id  columnId == 0 为发起人
       if (columnId === 0) {
         conditionList.value.push({ columnId: 0 })
       }
-      else {
-        conditionList.value.push(conditions.value.filter((item) => { return item.columnId === columnId })[0])
-      }
     }
   }
 }
@@ -110,47 +72,18 @@
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
-    const { columnId, showName, columnName, showType, columnType, fixedDownBoxValue } = conditionList.value[i]
+    const { columnId } = conditionList.value[i] // 条件id
     if ($func.toggleClass(conditionConfig.value.conditionList, conditionList.value[i], 'columnId')) {
       continue
     }
-    if (columnId === 0) {
-      conditionConfig.value.nodeUserList === []
-      conditionConfig.value.conditionList.push({
+    if (columnId === 0) { // 发起人
+      conditionConfig.value.nodeUserList = [] // 发起人列表置空
+      conditionConfig.value.conditionList.push({ // 条件列表增加发起人条件
         type: 1,
-        columnId,
+        columnId, // 条件id
         showName: '发起人',
       })
     }
-    else {
-      if (columnType === 'Double') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          optType: '1',
-          zdy1: '2',
-          opt1: '<',
-          zdy2: '',
-          opt2: '<',
-          columnDbname: columnName,
-          columnType,
-        })
-      }
-      else if (columnType === 'String' && showType === '3') {
-        conditionConfig.value.conditionList.push({
-          showType,
-          columnId,
-          type: 2,
-          showName,
-          zdy1: '',
-          columnDbname: columnName,
-          columnType,
-          fixedDownBoxValue,
-        })
-      }
-    }
   }
   // 3.弹窗无，外面有-
   for (let i = conditionConfig.value.conditionList.length - 1; i >= 0; i--) {
@@ -158,26 +91,30 @@
       conditionConfig.value.conditionList.splice(i, 1)
     }
   }
-  conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
-  conditionVisible.value = false
+  // 条件列表排序
+  conditionConfig.value.conditionList.sort((a: any, b: any) => { return a.columnId - b.columnId })
+  conditionVisible.value = false // 关闭选择条件对话框
 }
 
 // 抽屉点击确定--保存条件
 const saveCondition = () => {
+  // 关闭条件抽屉
   closeDrawer()
-  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
-  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0])// 填充新下标
-  conditionsConfig.value.conditionNodes.map((item, index) => {
+  const getIndex = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
+  conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, getIndex[0])// 填充新下标
+  conditionsConfig.value.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  console.log('conditionsConfig.value', conditionsConfig.value)
+
+  // 设置条件节点的文字，同时设置error字段（空节点控制提示）
   for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error = $func.conditionStr(conditionsConfig.value, i) === '请设置条件' && i !== conditionsConfig.value.conditionNodes.length - 1
   }
+  // 保存条件设置
   setConditionsConfig({
     value: conditionsConfig.value,
     flag: true,
-    id: workFlowStore.conditionsConfig1.id,
+    id: workFlowStore.conditionsConfigValue.id,
   })
 }
 // 添加条件--人员
@@ -186,13 +123,13 @@
   checkedList.value = conditionConfig.value.nodeUserList
 }
 // 选好角色了
-const sureConditionRole = (data) => {
+const sureConditionRole = (data: any) => {
   conditionConfig.value.nodeUserList = data
   conditionRoleVisible.value = false
 }
 
 // 点击发起人
-const clickfq = (conditionList, param, columnId) => {
+const clickfq = (conditionList: any, param: any, columnId: number | string) => {
   $func.toChecked(conditionList, param, columnId)
 }
 </script>
@@ -223,22 +160,12 @@
 
         <ul>
           <li v-for="(item, index) in conditionConfig.conditionList" :key="index">
-            <!-- <el-button type="primary" @click="addConditionRole">
-              选择成员
-            </el-button> -->
             <span class="ellipsis">{{ item.type === 1 ? '发起人' : item.showName }}：</span>
             <div v-if="item.type === 1">
-              <!-- <p :class="conditionConfig.nodeUserList.length > 0 ? 'selected_list' : ''" style="cursor: text;" @click.self="addConditionRole">
-                <span v-for="(item1, index1) in conditionConfig.nodeUserList" :key="index1">
-                  {{ item1.name }}<img src="@/assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item1, 'targetId')">
-                </span>
-                <input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole">
-              </p> -->
               <el-input v-if="conditionConfig.nodeUserList.length === 0" type="text" placeholder="请选择具体人员/角色/部门" @click="addConditionRole" />
               <p v-if="conditionConfig && conditionConfig.nodeUserList && conditionConfig.nodeUserList.length" class="selected_list">
                 <span v-for="(item, index) in conditionConfig.nodeUserList" :key="index" class="people-box">
                   {{ item.name }}
-                  <!-- <img src="../../assets/images/add-close1.png" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')"> -->
                   <el-icon style="vertical-align: middle;cursor: pointer;" @click="$func.removeEle(conditionConfig.nodeUserList, item, 'targetId')">
                     <close />
                   </el-icon>
@@ -246,60 +173,6 @@
                 <a v-if="conditionConfig.nodeUserList && conditionConfig.nodeUserList.length !== 0" @click="conditionConfig.nodeUserList = []">清除</a>
               </p>
             </div>
-            <div v-else-if="item.columnType === 'String' && item.showType === 3">
-              <p class="check_box">
-                <a
-                  v-for="(item1, index1) in JSON.parse(item.fixedDownBoxValue)" :key="index1"
-                  :class="$func.toggleStrClass(item, item1.key) && 'active'" @click="toStrChecked(item, item1.key)"
-                >{{ item1.value }}</a>
-              </p>
-            </div>
-            <div v-else>
-              <p>
-                <select v-model="item.optType" :style="`width:${item.optType === 6 ? 370 : 100}px`" @change="changeOptType(item)">
-                  <option value="1">
-                    小于
-                  </option>
-                  <option value="2">
-                    大于
-                  </option>
-                  <option value="3">
-                    小于等于
-                  </option>
-                  <option value="4">
-                    等于
-                  </option>
-                  <option value="5">
-                    大于等于
-                  </option>
-                  <option value="6">
-                    介于两个数之间
-                  </option>
-                </select>
-                <input v-if="item.optType !== 6" v-model="item.zdy1" v-enter-number="2" type="text" :placeholder="`请输入${item.showName}`">
-              </p>
-              <p v-if="item.optType === 6">
-                <input v-model="item.zdy1" v-enter-number="2" type="text" style="width: 75px;" class="mr_10">
-                <select v-model="item.opt1" style="width: 60px;">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <span class="ellipsis" style="display: inline-block;width: 60px;vertical-align: text-bottom;">{{ item.showName }}</span>
-                <select v-model="item.opt2" style="width: 60px;" class="ml_10">
-                  <option value="<">
-                    &lt;
-                  </option>
-                  <option value="≤">
-                    ≤
-                  </option>
-                </select>
-                <input v-model="item.zdy2" v-enter-number="2" type="text" style="width: 75px;">
-              </p>
-            </div>
             <a v-if="item.type === 1" @click="conditionConfig.nodeUserList = [];$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
             <a v-if="item.type === 2" @click="$func.removeEle(conditionConfig.conditionList, item, 'columnId')">删除</a>
           </li>
@@ -327,13 +200,14 @@
           </template>
         </el-dialog>
       </div>
+
       <!-- 成员弹框 -->
       <select-employees-dialog
         v-model:visible="conditionRoleVisible"
         v-model:data="checkedList"
         @change="sureConditionRole"
       />
-      <div class="demo-drawer__footer clear">
+      <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveCondition">
           确 定
         </el-button>
@@ -369,11 +243,11 @@
   }
 
   .condition_content {
-    padding: 20px 20px 0;
+    // padding: 20px 20px 0;
 
     p.tip {
       margin: 20px 0;
-      width: 510px;
+      width: 445px;
       text-indent: 17px;
       line-height: 45px;
       background: rgb(241 249 255 / 100%);
diff --git a/src/components/drawer/copyerDrawer.vue b/src/components/drawer/copyerDrawer.vue
index 6a1bf01..e06bd1f 100644
--- a/src/components/drawer/copyerDrawer.vue
+++ b/src/components/drawer/copyerDrawer.vue
@@ -1,5 +1,5 @@
 <!-- 抄送人设置 -->
-<script setup>
+<script setup name="CopyerDrawer">
 import { computed, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import selectEmployeesDialog from '../dialog/selectEmployeesDialog.vue'
@@ -11,7 +11,7 @@
 const ccSelfSelectFlag = ref([])
 const copyerVisible = ref(false)
 const checkedList = ref([])
-// const { copyerDrawer, copyerConfig1 } = workFlowStore
+// const { copyerDrawer, copyerConfigValue } = workFlowStore
 const { setCopyerConfig, setCopyer } = workFlowStore
 
 const closeDrawer = () => {
@@ -25,7 +25,7 @@
     closeDrawer()
   },
 })
-watch(() => workFlowStore.copyerConfig1, (val) => {
+watch(() => workFlowStore.copyerConfigValue, (val) => {
   copyerConfig.value = val.value
   ccSelfSelectFlag.value = copyerConfig.value.ccSelfSelectFlag == 0 ? [] : [copyerConfig.value.ccSelfSelectFlag]
 })
@@ -51,7 +51,7 @@
   setCopyerConfig({
     value: copyerConfig.value,
     flag: true,
-    id: workFlowStore.copyerConfig1.id,
+    id: workFlowStore.copyerConfigValue.id,
   })
   closeDrawer()
 }
diff --git a/src/components/drawer/promoterDrawer.vue b/src/components/drawer/promoterDrawer.vue
index df043ca..bdf885c 100644
--- a/src/components/drawer/promoterDrawer.vue
+++ b/src/components/drawer/promoterDrawer.vue
@@ -7,7 +7,7 @@
 const flowPermission = ref([])
 const promoterVisible = ref(false)
 const checkedList = ref([])
-// const { promoterDrawer, flowPermission1 } = workFlowStore
+// const { promoterDrawer, flowPermissionValue } = workFlowStore
 const { setPromoter, setFlowPermission } = workFlowStore
 
 const closeDrawer = () => {
@@ -24,7 +24,7 @@
     closeDrawer()
   },
 })
-watch(workFlowStore.flowPermission1, (val) => {
+watch(workFlowStore.flowPermissionValue, (val) => {
   flowPermission.value = val.value
 })
 
@@ -40,7 +40,7 @@
   setFlowPermission({
     value: flowPermission.value,
     flag: true,
-    id: workFlowStore.flowPermission1.value.id,
+    id: workFlowStore.flowPermissionValue.value.id,
   })
   closeDrawer()
 }
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index e28e29b..b773386 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,37 +8,36 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-// const workFlowStore = useWorkFlowStore()
 const visible = ref(false) // 对话框显隐
 
-// 添加节点
+// 添加节点（给节点设置初始值）
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
     if (type == 1) { // 审核
       data = {
-        nodeName: '审核人',
-        error: true,
-        type: 1,
-        settype: 1,
+        nodeName: '审核人', // 节点名称
+        error: true, // 控制空节点提示
+        type: 1, // 节点类型
+        settype: 1, // 负责人类型 1成员、2主管、7连续多级主管、11角色
         selectMode: 0,
         selectRange: 0,
-        directorLevel: 1,
-        examineMode: 1,
-        noHanderAction: 1,
-        examineEndDirectorLevel: 0,
+        directorLevel: 1, // 审批终点-主管
+        examineMode: 1, // 审批方式
+        noHanderAction: 1, // 审批人为空时
+        examineEndDirectorLevel: 0, // 审批终点-连续多级主管
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
         nodeUserList: [],
       }
     }
     else if (type == 2) { // 抄送
       data = {
-        nodeName: '抄送人',
-        type: 2,
+        nodeName: '抄送人', // 节点名称
+        type: 2, // 节点类型
         ccSelfSelectFlag: 1,
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
-        nodeUserList: [],
+        nodeUserList: [], // 抄送人数据
       }
     }
     emits('update:childNodeP', data)
@@ -50,10 +48,10 @@
       type: 4,
       childNode: null,
       conditionNodes: [{
-        nodeName: '条件1',
-        error: true,
-        type: 3,
-        priorityLevel: 1,
+        nodeName: '条件1', // 节点名称
+        error: true, // 控制空节点提示
+        type: 3, // 节点类型
+        priorityLevel: 1, // 优先级
         conditionList: [],
         nodeUserList: [],
         childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
diff --git a/src/components/workFlow/addNodeBan.vue b/src/components/workFlow/addNodeBan.vue
index fbb5b98..95a601f 100644
--- a/src/components/workFlow/addNodeBan.vue
+++ b/src/components/workFlow/addNodeBan.vue
@@ -89,11 +89,6 @@
             <p>条件分支</p>
           </a>
         </div>
-        <template #reference>
-          <!-- <button class="btn" type="button">
-            <span class="iconfont"></span>
-          </button> -->
-        </template>
       </el-popover>
     </div>
   </div>
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 9cd1d79..92b26e4 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -18,7 +18,7 @@
 
 const userStore = useUserStore()
 
-const workFlowStore = useWorkFlowStore()
+const workFlowStore = useWorkFlowStore() // store
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
 const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
@@ -26,22 +26,24 @@
 const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
-// 节点内容--处理节点里的文字
+
 const showText = computed(() => {
-  console.log('showText')
-  if (props.nodeConfig.type == 0) { // 发起人
-    // return userStore.name
+  // 设置发起人节点的showText显示文字
+  if (props.nodeConfig.type == 0) {
     // return $func.arrToStr(props.flowPermission) || userStore.name
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
-  if (props.nodeConfig.type == 1) { // 审批
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig) // 抄送
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
 })
+
+// 监听到节点配置的变化，重新设置节点文字内容
 watch(() => props.nodeConfig, () => {
-  console.log('watch nodeConfig')
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
@@ -50,47 +52,54 @@
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
+// 条件控制节点显示输入框的字段{0: true}
+const isInputList = ref<{ [key: number]: boolean }>([])
+// 审批和抄送控制节点名称显示输入框的字段
 const isInput = ref(false)
 
-// 条件不设置提醒（红色感叹号）
+// 条件设置提醒（红色感叹号）
 const resetConditionNodesErr = () => {
   for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
 }
+
 onMounted(() => {
+  // 设置审核节点的error（控制红色感叹号，true表示节点为空）
   if (props.nodeConfig.type == 1) {
     props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
   }
+  // 抄送
   else if (props.nodeConfig.type == 2) {
     props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
   }
+  // 条件
   else if (props.nodeConfig.type == 4) {
     resetConditionNodesErr()
   }
 })
-// 审批
-watch(() => workFlowStore.approverConfig1, (val: { flag: boolean; id: string; value: any }) => {
+
+// 审批（监听到审批设置的改变，更新父组件节点）
+watch(() => workFlowStore.approverConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 发起人
-watch(() => workFlowStore.flowPermission1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.flowPermissionValue, (val: { flag: boolean; id: string; value: any }) => {
   if (val.flag && val.id === _uid) {
     emits('update:flowPermission', val.value)
   }
 })
 // 条件
-watch(() => workFlowStore.conditionsConfig1, (val: { flag: boolean; id: string; value: any }) => {
+watch(() => workFlowStore.conditionsConfigValue, (val: { flag: boolean; id: string; value: any }) => {
   console.log('val.flag', val.flag, val.id, _uid)
   if (val.flag && val.id === _uid) {
     emits('update:nodeConfig', val.value)
   }
 })
 // 抄送
-// watch(() => workFlowStore.copyerConfig1, (val: { flag: boolean; id: string; value: any }) => {
+// watch(() => workFlowStore.copyerConfigValue, (val: { flag: boolean; id: string; value: any }) => {
 //   if (val.flag && val.id === _uid) {
 //     emits('update:nodeConfig', val.value)
 //   }
@@ -107,20 +116,20 @@
 
 // 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = true
   }
-  else {
+  else { // 审批、抄送
     isInput.value = true
   }
 }
 // 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
+  if (index || index === 0) { // 条件
+    isInputList.value[index as number] = false
     props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
   }
-  else {
+  else { // 审批、抄送
     isInput.value = false
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
@@ -128,7 +137,7 @@
 
 // 删除节点--（审批、抄送）
 const delNode = () => {
-  emits('update:nodeConfig', props.nodeConfig.childNode)
+  emits('update:nodeConfig', props.nodeConfig.childNode) // 更新节点配置
 }
 
 // 点击添加条件
@@ -143,8 +152,9 @@
     childNode: null,
   })
   resetConditionNodesErr() // 检查空节点
-  emits('update:nodeConfig', props.nodeConfig)
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点配置
 }
+
 const reData = (data: any, addData: any) => {
   if (!data.childNode) {
     data.childNode = addData
@@ -180,9 +190,10 @@
 const setPerson = (priorityLevel: any) => {
   const { type } = props.nodeConfig // 节点类型
   if (type == 1) { // 审批
-    // const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true) // drawer
-    setApproverConfig({ // 节点数据设置
+    // 控制审批抽屉显隐
+    setApprover(true)
+    // 审批节点数据设置
+    setApproverConfig({
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -192,7 +203,9 @@
     })
   }
   else if (type == 2) { // 抄送
+    // 控制抄送抽屉显隐
     setCopyer(true)
+    // 抄送节点数据设置
     setCopyerConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       flag: false,
@@ -200,7 +213,9 @@
     })
   }
   else { // 条件
+    // 控制条件抽屉显隐
     setCondition(true)
+    // 条件节点数据设置
     setConditionsConfig({
       value: JSON.parse(JSON.stringify(props.nodeConfig)),
       priorityLevel,
@@ -220,14 +235,15 @@
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
     item.priorityLevel = index + 1
   })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
+  resetConditionNodesErr() // 检查条件空节点（红色感叹号）
+  emits('update:nodeConfig', props.nodeConfig) // 更新节点内容
 }
 </script>
 
 <template>
+  <!-- 非条件 -->
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -240,7 +256,6 @@
             class="ant-input editable-title-input"
             :placeholder="defaultText"
             @blur="blurEvent(null)"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title" @click="clickEvent(null)">{{ nodeConfig.nodeName }}</span>
           <i class="anticon anticon-close close" @click="delNode" />
@@ -269,7 +284,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div v-if="index !== 0" class="sort-left" @click="arrTransfer(index, -1)">
                   &lt;
                 </div>
@@ -281,7 +296,6 @@
                     type="text"
                     class="ant-input editable-title-input"
                     @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title" @click="clickEvent(index)">{{ item.nodeName }}</span>
                   <span class="priority-title" @click="setPerson(item.priorityLevel)">优先级{{ item.priorityLevel }}</span>
@@ -294,7 +308,6 @@
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
                 <div v-if="item.error" class="error_tip">
-                  <!-- <div v-if="workFlowStore.isTried && item.error" class="error_tip"> -->
                   <i class="anticon anticon-exclamation-circle" />
                 </div>
               </div>
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 15d9957..4a3affb 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -1,7 +1,6 @@
-<script setup>
-import { computed, getCurrentInstance, onMounted, ref, watch } from 'vue'
+<script setup lang="ts" name="NodeWrapBan">
+import { computed, ref, watch } from 'vue'
 import $func from '@/plugins/preload'
-import useWorkFlowStore from '@/store/modules/workFlow'
 const props = defineProps({
   nodeConfig: {
     type: Object,
@@ -15,102 +14,43 @@
 
 const emits = defineEmits(['update:flowPermission', 'update:nodeConfig'])
 
-const workFlowStore = useWorkFlowStore()
-
-const _uid = getCurrentInstance().uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点背景色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 节点默认名字
   return placeholderList[props.nodeConfig.type]
 })
 const showText = computed(() => {
-  console.log('showText')
+  // 设置发起人节点的showText显示文字
   if (props.nodeConfig.type == 0) {
-    console.log('pppppppp')
-    console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
     // return props.flowPermission.name || userStore.name
     return '所有人'
   }
+  // 设置审批节点的showText显示文字
+  if (props.nodeConfig.type == 1) {
+    return $func.setApproverStr(props.nodeConfig)
+  }
+  // 设置审批节点的showText显示文字
+  return $func.copyerStr(props.nodeConfig)
+})
+
+// 监听到节点配置的变化，重新设置节点文字内容
+watch(() => props.nodeConfig, (val) => {
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
-})
-watch(() => props.nodeConfig, (val) => {
-  console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
-    return $func.setApproverStr(props.nodeConfig)
-  }
-  return $func.copyerStr(props.nodeConfig)
 }, {
   deep: true, // 深度监听的参数
 })
 
-const isInputList = ref([])
-const isInput = ref(false)
-const resetConditionNodesErr = () => {
-  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
-    props.nodeConfig.conditionNodes[i].error = $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
-  }
-}
-onMounted(() => {
-  if (props.nodeConfig.type == 1) {
-    props.nodeConfig.error = !$func.setApproverStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 2) {
-    props.nodeConfig.error = !$func.copyerStr(props.nodeConfig)
-  }
-  else if (props.nodeConfig.type == 4) {
-    resetConditionNodesErr()
-  }
-})
-const {
-  setPromoter,
-  setApprover,
-  setCopyer,
-  setCondition,
-  setFlowPermission,
-  setApproverConfig,
-  setCopyerConfig,
-  setConditionsConfig,
-} = workFlowStore
-const clickEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = true
-  }
-  else {
-    isInput.value = true
-  }
-}
-const blurEvent = (index) => {
-  if (index || index === 0) {
-    isInputList.value[index] = false
-    props.nodeConfig.conditionNodes[index].nodeName = props.nodeConfig.conditionNodes[index].nodeName || '条件'
-  }
-  else {
-    isInput.value = false
-    props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
-  }
-}
-const arrTransfer = (index, type = 1) => {
-  // 向左-1,向右1
-  props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
-    index + type,
-    1,
-    props.nodeConfig.conditionNodes[index],
-  )[0]
-  props.nodeConfig.conditionNodes.map((item, index) => {
-    item.priorityLevel = index + 1
-  })
-  resetConditionNodesErr()
-  emits('update:nodeConfig', props.nodeConfig)
-}
+const isInputList = ref<{ [key: number]: boolean }>([]) // 条件控制节点显示输入框的字段{0: true}
+const isInput = ref(false) // 审批和抄送控制节点名称显示输入框的字段
 </script>
 
 <template>
   <div v-if="nodeConfig.type < 3" class="node-wrap">
-    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (workFlowStore.isTried && nodeConfig.error ? 'active error' : '')">
+    <div class="node-wrap-box" :class="(nodeConfig.type === 0 ? 'start-node ' : '') + (nodeConfig.error ? 'active error' : '')">
       <div class="title" :style="`background: rgb(${bgColors[nodeConfig.type]});`">
         <span v-if="nodeConfig.type === 0">{{ nodeConfig.nodeName }}</span>
         <template v-else>
@@ -122,11 +62,8 @@
             type="text"
             class="ant-input editable-title-input"
             :placeholder="defaultText"
-            @blur="blurEvent()"
-            @focus="$event.currentTarget.select()"
           >
           <span v-else class="editable-title">{{ nodeConfig.nodeName }}</span>
-          <!-- <i class="anticon anticon-close close" /> -->
         </template>
       </div>
       <div class="content">
@@ -134,10 +71,6 @@
           <span v-if="!showText" class="placeholder">请选择{{ defaultText }}</span>
           {{ showText }}
         </div>
-        <!-- <i class="anticon anticon-right arrow" /> -->
-      </div>
-      <div v-if="workFlowStore.isTried && nodeConfig.error" class="error_tip">
-        <!-- <i class="anticon anticon-exclamation-circle" /> -->
       </div>
     </div>
     <add-node-ban v-model:childNodeP="nodeConfig.childNode" />
@@ -151,10 +84,7 @@
         <div v-for="(item, index) in nodeConfig.conditionNodes" :key="index" class="col-box">
           <div class="condition-node">
             <div class="condition-node-box">
-              <div class="auto-judge" :class="workFlowStore.isTried && item.error ? 'error active' : ''">
-                <!-- <div v-if="index !== 0" class="sort-left">
-                  &lt;
-                </div> -->
+              <div class="auto-judge" :class="item.error ? 'error active' : ''">
                 <div class="title-wrapper">
                   <input
                     v-if="isInputList[index]"
@@ -162,22 +92,13 @@
                     v-focus
                     type="text"
                     class="ant-input editable-title-input"
-                    @blur="blurEvent(index)"
-                    @focus="$event.currentTarget.select()"
                   >
                   <span v-else class="editable-title">{{ item.nodeName }}</span>
                   <span class="priority-title">优先级{{ item.priorityLevel }}</span>
-                  <!-- <i class="anticon anticon-close close" /> -->
                 </div>
-                <!-- <div v-if="index !== nodeConfig.conditionNodes.length - 1" class="sort-right">
-                  &gt;
-                </div> -->
                 <div class="content">
                   {{ $func.conditionStr(nodeConfig, index) }}
                 </div>
-                <div v-if="workFlowStore.isTried && item.error" class="error_tip">
-                  <!-- <i class="anticon anticon-exclamation-circle" /> -->
-                </div>
               </div>
               <add-node-ban v-model:childNodeP="item.childNode" />
             </div>
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a58f41e..a4cc107 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -55,7 +55,7 @@
     }
   },
   dealStr(str: any, obj: any) {
-    const arr = []
+    const arr = [] as any
     const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
@@ -100,4 +100,4 @@
   },
 }
 
-export default new All()
+export default new (All as any)()
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 81c2046..08409b5 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -52,7 +52,7 @@
       {
         path: 'order/:type/:id?',
         name: 'OrderDetail',
-        component: () => import('@/views/business/schedule/order/orderList.vue'),
+        component: () => import('@/views/business/schedule/order/orderListEdit.vue'),
         meta: {
           title: '委托书详情',
           icon: 'ep:key',
@@ -128,17 +128,39 @@
         },
       },
       {
-        path: 'task/:type/:id?',
+        path: 'task/:role/:id?',
         name: 'taskDetail',
         component: () => import('@/views/business/schedule/task/taskEdit.vue'),
         meta: {
-          title: '任务分发详情',
+          title: '样品详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/schedule/taskList',
         },
       },
+      {
+        path: 'certPrintList',
+        name: 'CerPrintList',
+        component: () => import('@/views/business/schedule/certPrint/certList.vue'),
+        meta: {
+          title: '证书打印',
+          icon: 'ep:key',
+          auth: '/schedule/certPrint',
+        },
+      },
+      {
+        path: 'cert/detail/:id?',
+        name: 'taskDetail',
+        component: () => import('@/views/business/schedule/certPrint/certDetail.vue'),
+        meta: {
+          title: '证书详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/schedule/certPrintList',
+        },
+      },
     ],
   },
   {
@@ -163,18 +185,6 @@
         },
       },
       {
-        path: '/myMesure/:type/:id?',
-        name: 'MyMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/myMeasureList',
-        },
-      },
-      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -185,18 +195,6 @@
         },
       },
       {
-        path: 'deptMeasure/:type/:id?',
-        name: 'DeptMeasureDetail',
-        component: () => import('@/views/business/lab/myMeasure/labMeasureEdit.vue'),
-        meta: {
-          title: '检测详情',
-          icon: 'ep:key',
-          sidebar: false,
-          breadcrumb: true,
-          activeMenu: '/lab/deptMeasureList',
-        },
-      },
-      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 94dc0a1..33b7689 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -1,35 +1,40 @@
 import { defineStore } from 'pinia'
+// interface Icommon { // 审批、抄送、条件设置类型、（发起人--由于）
+//   flag?: boolean
+//   id?: string
+//   value?: any
+//   conditionNodes?: []
+// }
 const useWorkFlowStore = defineStore(
   'workFlow',
   {
     state: () => ({
       tableId: '', // 审批id
-      isTried: false,
-      promoterDrawer: false,
-      flowPermission1: {},
+      promoterDrawer: false, // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
+      flowPermissionValue: {} as any, // 发起人配置（暂时无用--发起人暂时固定所有人）
       approverDrawer: false, // 审批抽屉显示隐藏
-      approverConfig1: {}, // 审批设置
-      copyerDrawer: false,
-      copyerConfig1: {},
-      conditionDrawer: false,
-      conditionsConfig1: {
+      approverConfigValue: {} as any, // 审批人配置
+      copyerDrawer: false, // 抄送抽屉显示隐藏
+      copyerConfigValue: {} as any, // 抄送人配置
+      conditionDrawer: false, // 条件抽屉显示隐藏
+      conditionsConfigValue: { // 条件配置
         conditionNodes: [],
-      },
+      } as any,
       conditonErrorCount: 0, // 条件错误数量
       approverErrorCount: 0, // 审批错误数量
     }),
     actions: {
+      // 设置审批id
       setTableId(payload: string) {
         this.tableId = payload
       },
-      setIsTried(payload: boolean) {
-        this.isTried = payload
-      },
+      // 发起人抽屉显示隐藏（暂时无用--发起人暂时固定所有人）
       setPromoter(payload: boolean) {
         this.promoterDrawer = payload
       },
+      // 发起人配置（暂时无用--发起人暂时固定所有人）
       setFlowPermission(payload: object) {
-        this.flowPermission1 = payload
+        this.flowPermissionValue = payload
       },
       // 审批抽屉显隐
       setApprover(payload: boolean) {
@@ -37,19 +42,23 @@
       },
       // 审批设置
       setApproverConfig(payload: object) {
-        this.approverConfig1 = payload
+        this.approverConfigValue = payload
       },
+      // 抄送抽屉显示隐藏
       setCopyer(payload: boolean) {
         this.copyerDrawer = payload
       },
+      // 抄送人配置
       setCopyerConfig(payload: object) {
-        this.copyerConfig1 = payload
+        this.copyerConfigValue = payload
       },
+      // 条件抽屉显示隐藏
       setCondition(payload: boolean) {
         this.conditionDrawer = payload
       },
+      // 条件配置
       setConditionsConfig(payload: any) {
-        this.conditionsConfig1 = payload
+        this.conditionsConfigValue = payload
       },
     },
   },
diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts
new file mode 100644
index 0000000..df0ba5c
--- /dev/null
+++ b/src/views/business/schedule/certPrint/cert-interface.ts
@@ -0,0 +1,86 @@
+// 证书打印查询
+export interface ICertPrintSearch {
+  certificationReportCode: string // 证书编号
+  orderNo: string // 委托书编号
+  customerName: string // 委托方名称
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  certificateReportType: string // 证书类型
+  printNum: number | '' // 打印次数 -未打印和全部用
+  approvalStatus: string // 审批状态-审批查询用
+  formId: string // 审批用formId
+  offset: number
+  limit: number
+}
+
+// 证书打印列表
+export interface ICerPrintList {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  crateUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  printStatusName: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态
+}
+
+// 证书详情
+export interface ICertification {
+  certificationId: string // 证书id
+  certificationReportCode: string // 证书编号
+  certificationReportName: string // 证书名称
+  certificateReportType: string // 证书类型
+  certificateReportTypeName: string // 证书类型
+  sampleId: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderId: string // 委托书id
+  orderNo: string // 委托书编号
+  customerNo: string // 客户编号
+  customerName: string // 客户名称
+  measureCatogory: string // 检校类别
+  measureCatogoryName: string // 检校类别
+  createUser: string // 检定人员
+  createUserName: string // 检定人员
+  printNum: string | number// 打印状态-打印次数
+  printStatus: string // 可打印状态 0不可打印1可打印
+  createTime: string // 生成时间
+  calibrationMajor: string // 检校专业
+  issuanceDate: string // 出具日期
+  signId: string // 电子签章
+  signName: string // 电子签章
+  approvalSignId: string // 认可标志专用章
+  approvalSignName: string // 认可标志专用章
+  certificateReportFile: string // 证书报告附件
+  originalRecordId: string // 原始记录id
+  originalRecordCode: string // 原始记录编号
+  roomNumber: string // 检校地点
+  temperature: string // 温度
+  humidity: string // 相对湿度
+  manufacturer: string // 生产厂家
+  customerPhone: string // 委托方电话
+  customerAddress: string // 委托方地址
+  deliverer: string // 送检人
+  delivererTel: string // 联系方式
+  planDeliverTime: string // 预计送达时间
+  requireOverTime: string // 预计检完时间
+  mesureContent: string // 检定项目
+  remark: string // 备注
+}
diff --git a/src/views/business/schedule/certPrint/certDetail.vue b/src/views/business/schedule/certPrint/certDetail.vue
new file mode 100644
index 0000000..f25fb24
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certDetail.vue
@@ -0,0 +1,614 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import type { ICertification } from './cert-interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // 证书id
+const printStatus = ref('') // 可打印状态
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.id) {
+  infoId.value = $route.query.id as string
+}
+if ($route.query && $route.query.printStatus) {
+  printStatus.value = $route.query.printStatus as string
+}
+
+// 逻辑代码
+const dataForm = ref<ICertification>({
+  certificationId: '',
+  certificationReportCode: '',
+  certificationReportName: '',
+  certificateReportType: '',
+  certificateReportTypeName: '',
+  sampleId: '',
+  sampleNo: '',
+  sampleName: '',
+  sampleModel: '',
+  manufacturingNo: '',
+  orderId: '',
+  orderNo: '',
+  customerNo: '',
+  customerName: '',
+  measureCatogory: '',
+  measureCatogoryName: '',
+  createUser: '',
+  createUserName: '',
+  printNum: '',
+  printStatus: '',
+  createTime: '',
+  calibrationMajor: '',
+  issuanceDate: '',
+  signId: '',
+  signName: '',
+  approvalSignId: '',
+  approvalSignName: '',
+  certificateReportFile: '',
+  originalRecordId: '',
+  originalRecordCode: '',
+  roomNumber: '',
+  temperature: '',
+  humidity: '',
+  manufacturer: '',
+  customerPhone: '',
+  customerAddress: '',
+  deliverer: '',
+  delivererTel: '',
+  planDeliverTime: '',
+  requireOverTime: '',
+  mesureContent: '',
+  remark: '',
+})
+
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
+}
+const checkTypeOptions = ref<IOptions[]>([])
+const calibrationMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'calibrationMajor') {
+      calibrationMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('calibrationMajor') // 获取校准专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+const approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+
+// 所用设备列表
+const deviceList = ref([])
+// 标准装置列表
+const standardDeviceList = ref([])
+// 文件列表
+const fileList = ref([])
+
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
+}
+
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center', required: true, choose: true, time: false },
+  { text: '设备编号', value: 'equipmentNo', align: 'center', required: true, choose: false, time: false },
+  { text: '型号', value: 'modelNo', align: 'center', required: true, choose: false, time: false },
+  { text: '出厂编号', value: 'mesureResult', align: 'center', required: true, choose: false, time: false },
+  { text: '证书有效期', value: 'validDate', align: 'center', required: true, choose: false, time: false },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
+}
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  dataForm.value = {
+    certificationId: '1111',
+    certificationReportCode: '1111',
+    certificationReportName: '校准证书',
+    certificateReportType: '1',
+    certificateReportTypeName: '校准证书',
+    sampleId: '1',
+    sampleNo: '45678652',
+    sampleName: '压力表',
+    sampleModel: 'xx',
+    manufacturingNo: '北无',
+    orderId: '123456',
+    orderNo: '123456',
+    customerNo: '4578545',
+    customerName: '京东',
+    measureCatogory: '1',
+    measureCatogoryName: '光学',
+    createUser: '',
+    createUserName: '张三',
+    printNum: '0',
+    printStatus: '1',
+    createTime: '2023-01-05',
+    calibrationMajor: '1',
+    issuanceDate: '2023-02-05',
+    signId: '',
+    signName: '公司公章',
+    approvalSignId: '',
+    approvalSignName: 'CNAS章',
+    certificateReportFile: '',
+    originalRecordId: '',
+    originalRecordCode: '11111',
+    roomNumber: '304',
+    temperature: '36',
+    humidity: '27',
+    manufacturer: '北无',
+    customerPhone: '',
+    customerAddress: '',
+    deliverer: '张三',
+    delivererTel: '87447',
+    planDeliverTime: '2023-02-05',
+    requireOverTime: '2023-02-05',
+    mesureContent: 'IP68',
+    remark: '',
+  }
+}
+
+getInfo(infoId.value)
+
+// 保存后的id
+const addId = ref('')
+
+// 打印证书
+const printCert = () => {
+
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="证书打印">
+      <template #btns>
+        <el-button v-if="printStatus === '1'" type="primary" @click="printCert">
+          打印
+        </el-button>
+        <el-button type="primary" @click="printCert">
+          预览
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form ref="ruleFormRef" :model="dataForm" label-position="right" label-width="auto">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:">
+              <el-select
+                v-model="dataForm.calibrationMajor"
+                clearable
+                size="default"
+                class="full-width-input"
+                placeholder=""
+                disabled
+              >
+                <el-option
+                  v-for="item in calibrationMajorList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出具日期:">
+              <el-input v-model="dataForm.issuanceDate" class="full-width-input" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-input
+                v-model.trim="dataForm.certificationReportCode"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:">
+              <el-input
+                v-model.trim="dataForm.certificationReportName"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="电子签章:">
+              <el-input
+                v-model.trim="dataForm.signName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:">
+              <el-input
+                v-model.trim="dataForm.approvalSignName"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="dataForm.certificateReportFile" :minio-file-name="dataForm.certificateReportFile" />
+              <span v-else>无附件</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="dataForm.originalRecordCode"
+                class="full-width-input"
+                disabled
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    查看
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="dataForm.roomNumber"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="dataForm.temperature"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="dataForm.humidity"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="dataForm.sampleNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="dataForm.sampleName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="dataForm.manufacturingNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="dataForm.sampleModel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="dataForm.manufacturer"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="dataForm.customerNo"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="dataForm.customerName"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="dataForm.customerPhone"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="委托方地址:" prop="uncertainty">
+              <el-input
+                v-model.trim="dataForm.customerAddress"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.deliverer"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="dataForm.delivererTel"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="dataForm.planDeliverTime"
+                type="datetime"
+                class="full-width-input"
+                clearable
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="dataForm.requireOverTime"
+                type="datetime"
+                class="full-width-input"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="dataForm.mesureContent"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="dataForm.remark"
+                class="full-width-input"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title=" 所用设备">
+      <el-table :data="deviceList" border style="width: 100%;">
+        <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"
+        />
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <el-table :data="fileList" border style="width: 100%;">
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columnsFiles"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        />
+      </el-table>
+    </detail-block>
+  </app-container>
+</template>
+
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
+}
+</style>
diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue
new file mode 100644
index 0000000..c6e9db4
--- /dev/null
+++ b/src/views/business/schedule/certPrint/certList.vue
@@ -0,0 +1,316 @@
+<script lang="ts" setup name="CustomerList">
+import { getCurrentInstance, ref } from 'vue'
+import type { Ref } from 'vue'
+import type { DateModelType } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import type { ICerPrintList, ICertPrintSearch } from './cert-interface'
+import DistributeDialog from './components/distributeDialog.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 type { dictType } from '@/global'
+const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
+// 右上角按钮
+const menus = [
+  { name: '未打印', value: '未打印' },
+  { name: '全部', value: '全部' },
+  { name: '待审批', value: '待审批' },
+  { name: '已通过', value: '已通过' },
+  { name: '未通过', value: '未通过' },
+]
+const currentMenu = ref('未打印') // 当前选中状态
+// 查询条件
+const listQuery = ref<ICertPrintSearch>({
+  certificationReportCode: '', // 证书编号
+  orderNo: '', // 委托书编号
+  customerName: '', // 委托方名称
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  certificateReportType: '', // 证书类型
+  printNum: '', // 打印次数 -未打印和全部用
+  approvalStatus: '', // 审批状态-审批查询用
+  formId: 'jlglsygfsp',
+  offset: 1,
+  limit: 20,
+})
+// --------------获取所需字典值----------------
+const certificationClassList = ref<dictType[]>([]) // 样品属性列表
+function getDict() {
+  // 获取样品属性
+  getDictByCode('certificationClass').then((response) => {
+    certificationClassList.value = response.data
+  })
+}
+getDict()
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书编号', value: 'certificationReportCode', align: 'center' },
+  { text: '证书名称', value: 'certificationReportName', 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: '', align: 'center', width: '85px', filter: (row: ICerPrintList) => { return row.printNum == 0 ? '未打印' : `${row.printNum}次打印` } },
+  { text: '生成时间', value: 'createTime', align: 'center', width: '165px' },
+])
+// 表格数据
+const list = ref<ICerPrintList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+
+// 根据过滤查询条件
+function filterQuery() {
+  switch (currentMenu.value) {
+    case '未打印':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '全部':
+      listQuery.value.printNum = 0
+      listQuery.value.approvalStatus = ''
+      break
+    case '待审批':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '1'
+      break
+    case '审批中':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '2'
+      break
+    case '已通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '3'
+      break
+    case '未通过':
+      listQuery.value.printNum = ''
+      listQuery.value.approvalStatus = '4'
+      break
+  }
+}
+
+// 数据查询
+function fetchData(isNowPage = false) {
+  filterQuery()
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // 模拟数据
+  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: '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) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    certificationReportCode: '', // 证书编号
+    orderNo: '', // 委托书编号
+    customerName: '', // 委托方名称
+    sampleNo: '', // 样品编号
+    sampleName: '', // 样品名称
+    certificateReportType: '', // 证书类型
+    printNum: '', // 打印次数 -未打印和全部用
+    approvalStatus: '', // 审批状态-审批查询用
+    formId: 'jlglsygfsp',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击详情
+const handleDetail = (row: ICerPrintList) => {
+  $router.push(`/schedule/cert/detail/${row.certificationId}?printStatus=${row.printStatus}`)
+}
+
+// 点击分发， 弹窗
+const distributeDialogRef = ref()
+const handleDistribute = (row: ICerPrintList) => {
+  // distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    // const params = {
+    //   bussinessSize: listQuery.value.bussinessSize, // 业务规模
+    //   customerName: listQuery.value.customerName, // 公司名称
+    //   customerNo: listQuery.value.customerNo, // 任务分发编号
+    //   grade: listQuery.value.grade, // 履约评级
+    //   ids: checkoutList.value,
+    // }
+    // exportCustomerList(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: ICerPrintList) => checkoutList.value.includes(item.certificationId))
+    printJSON(printList, properties, '证书打印列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 选择按钮变更
+watch(currentMenu, (val: string) => {
+  fetchData(false)
+})
+
+fetchData(false)
+</script>
+
+<template>
+  <app-container>
+    <div class="float-radio-buttons">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="currentMenu">
+        <el-radio-button v-for="item in menus" :key="item.name" :label="item.value">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.certificationReportCode"
+          placeholder="证书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderNo"
+          placeholder="委托书编号"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerName"
+          placeholder="委托方名称"
+          clearable
+          class="short-input"
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.sampleName"
+          placeholder="样品名称"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.certificateReportType" placeholder="证书类型" style="width: 120px;" clearable>
+          <el-option v-for="item in certificationClassList" :key="item.id" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/meter/customer/export')" 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" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column v-if="listQuery.printNum === ''" label="审批状态" align="center" width="90px" prop="approvalStatusName" />
+          <el-table-column label="操作" align="center" fixed="right" width="120">
+            <template #default="{ row }">
+              <el-button size="small" link type="primary" @click="handleDetail(row)">
+                详情
+              </el-button>
+              <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>
+              <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="handleDistribute(row)">
+                拒绝
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.short-input {
+  width: 160px;
+}
+</style>
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index 734f146..be7f8bd 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,6 +4,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
+import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -12,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -298,14 +300,26 @@
           type: 'warning',
         },
       ).then(() => {
-        updateSample(dataForm.value).then((res) => {
-          if (res.code === 200) {
-            dataForm.value.id = res.data.id
-            dataForm.value.customerNo = res.data.customerNo
-            ElMessage.success('已保存')
-            $router.go(-1)
-          }
-        })
+        if (dataForm.value.id) {
+          updateSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+        else {
+          addSample(dataForm.value).then((res) => {
+            if (res.code === 200) {
+              dataForm.value.id = res.data.id
+              dataForm.value.customerNo = res.data.customerNo
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
       })
     }
   })
@@ -590,7 +604,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -600,7 +614,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -611,34 +625,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 759e08a..6e5c9b9 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -172,6 +172,7 @@
     endTime: '', // 预计送达结束时间
     isUrgent: '', // 是否加急
     sampleAttr: '', // 样品属性
+    type: currentMenu.value,
     offset: 1,
     limit: 20,
   }
@@ -255,78 +256,57 @@
   )
     .then(() => {
       if (type === 'take') { // 收入
-        interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTake({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'delete') { // 删除
-        interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListDelete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'complete') { // 完成
-        interchangeListComplete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListComplete({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'back') { // 回退
-        interchangeListBack({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListBack({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'return') { // 归还
-        interchangeListReturn({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListReturn({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'urge') { // 催办
-        interchangeListUrge({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListUrge({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
       }
       else if (type === 'terminate') { // 终止
-        interchangeListTerminate({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        interchangeListTerminate({ id: row.id, type: currentMenu.value }).then((res) => {
           if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: `已${title}`,
-            })
+            ElMessage.success(`已${title}`)
             fetchData(true)
           }
         })
@@ -361,7 +341,7 @@
 
 // 点击编辑或详情
 const goEdit = (row: IinterchangeList, pageType: 'edit' | 'detail') => {
-  $router.push(`/schedule/interchange/${pageType}/${row.sampleNo}`)
+  $router.push(`/schedule/interchange/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index 60c292d..fd09c75 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -6,8 +6,10 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
+// import { exportOrderList, getOrderList, orderListBack, orderListReceive } from '@/api/business/schedule/order'
 
 const { proxy } = getCurrentInstance() as any
+const $router = useRouter()
 
 // 查询条件
 const listQuery: Ref<IListQuery> = ref({
@@ -64,28 +66,22 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  // getInterChangeList(listQuery.value).then((response) => {
+  // getOrderList(listQuery.value).then((response) => {
   //   response.data.rows = [
   //     {
   //       id: 'test',
-  //       sampleNo: 'test', // 样品编号
-  //       sampleName: 'test', // 样品名称
-  //       sampleModel: 'test', // 型号
-  //       evaluationName: 'test', // 出厂编号
   //       orderCode: 'test', // 委托书编号
   //       customerId: 'test', // 委托方代码
   //       customerName: 'test', // 委托方名称
   //       deliverer: 'test', // 送检人
-  //       isUrgent: 'test', // 是否加急
-  //       sampleAttr: 'test', // 样品属性
-  //       planDeliverTime: 'test', // 预计送达时间
+  //       delivererTel: 'test', // 送样人联系方式
+  //       sampleQuantity: 40, // 样品数量
+  //       isUrgent: '1', // 是否加急
+  //       status: 'test', // 接收状态
+  //       createTime: 'test', // 创建时间
+  //       remark: '备注',
   //     }]
-  //   list.value = response.data.rows.map((item: IinterchangeList) => {
-  //     return {
-  //       ...item,
-  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-  //     }
-  //   })
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -152,26 +148,26 @@
   )
     .then(() => {
       if (type === 'receive') { // 接收
-        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListReceive({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
       else if (type === 'back') { // 退回
-        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
-        //   if (res.code === 200) {
-        //     ElMessage({
-        //       type: 'success',
-        //       message: `已${title}`,
-        //     })
-        //     fetchData(true)
-        //   }
-        // })
+        orderListBack({ id: row.id }).then((res) => {
+          if (res.code === 200) {
+            ElMessage({
+              type: 'success',
+              message: `已${title}`,
+            })
+            fetchData(true)
+          }
+        })
       }
     })
 }
@@ -193,7 +189,7 @@
       status: '', // 接收状态
       ids: checkoutList.value,
     }
-    // exportInterchangeList(params).then((res) => {
+    // exportOrderList(params).then((res) => {
     //   const blob = new Blob([res.data])
     //   exportFile(blob, '委托书列表.xlsx')
     // })
@@ -214,11 +210,11 @@
     }
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    printJSON(list.value, properties, '设备收发列表')
+    printJSON(list.value, properties, '委托书列表')
   }
   else if (checkoutList.value.length > 0) {
     const printList = list.value.filter((item: IOrderList) => checkoutList.value.includes(item.id))
-    printJSON(printList, properties, '设备收发列表')
+    printJSON(printList, properties, '委托书列表')
   }
   else {
     ElMessage.warning('无可打印内容')
@@ -259,8 +255,8 @@
 }
 
 // 点击编辑详情
-const goEdit = (row: IOrderList, type: string) => {
-
+const goEdit = (row: IOrderList, pageType: 'edit' | 'detail') => {
+  $router.push(`/schedule/order/${pageType}/${row.id}`)
 }
 
 fetchData(true)
diff --git a/src/views/business/schedule/order/orderListEdit.vue b/src/views/business/schedule/order/orderListEdit.vue
new file mode 100644
index 0000000..2e49511
--- /dev/null
+++ b/src/views/business/schedule/order/orderListEdit.vue
@@ -0,0 +1,5 @@
+<!-- 委托书详情 -->
+<script lang="ts" setup name="OrderListEdit">
+
+</script>
+
diff --git a/src/views/customer/bench/bench.vue b/src/views/customer/bench/bench.vue
index dc9216e..687a18d 100644
--- a/src/views/customer/bench/bench.vue
+++ b/src/views/customer/bench/bench.vue
@@ -71,7 +71,10 @@
 // 获取样品新增趋势数据
 function fetchSampleAddData() {
   getSampleAddData().then((res) => {
-    sampleAddXData.value = res.data.map((item: planReturn) => item.date)
+    sampleAddXData.value = res.data.map((item: planReturn) => {
+      // return item.date.replace('年', '-')
+      return item.date
+    })
     const yValue = res.data.map((item: planReturn) => Number(item.count))
     sampleAddYDataMax.value = Math.max(yValue) > 10 ? Math.max(yValue) : 10
     sampleAddData.value = [{ name: '客户', data: yValue }]
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index c27e136..153b66e 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,6 +13,7 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -602,7 +603,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -612,7 +613,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
+            <el-col v-if="pageType === 'detail'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -622,34 +623,6 @@
                 />
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="预计送达时间:">
-                <el-date-picker
-                  v-model="dataForm.planDeliverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col v-if="pageType !== 'add'" :span="6">
-              <el-form-item label="要求检完时间:">
-                <el-date-picker
-                  v-model="dataForm.requireOverTime"
-                  type="month"
-                  format="YYYY-MM"
-                  value-format="YYYY-MM"
-                  class="full-width-input"
-                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  :disabled="pageType === 'detail'"
-                />
-              </el-form-item>
-            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/customer/sample/list/list.vue b/src/views/customer/sample/list/list.vue
index ac83279..d4a4c0f 100644
--- a/src/views/customer/sample/list/list.vue
+++ b/src/views/customer/sample/list/list.vue
@@ -15,7 +15,7 @@
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -29,7 +29,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -47,46 +47,18 @@
 const fileRef = ref()
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: '1', // 样品编号
-      sampleName: '1', // 样品名称
-      sampleModel: '1', // 型号
-      evaluationName: '1', // 出厂编号
-      customerId: '1', // 委托方代码
-      customerName: '1', // 委托方名称
-      mesurePeriod: '1', // 检定周期
-      effectiveDate: '1', // 上次检定时间
-      remark: '备注', // 备注
-    }]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -130,7 +102,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -138,6 +110,7 @@
     limit: 20,
   }
   timeRange.value = ['', '']
+  fetchData(true)
 }
 
 // 上传文件/批量导入
@@ -197,7 +170,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -267,7 +240,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
@@ -286,7 +259,7 @@
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
-            value-format="YYYY-MM-DD h:m:s"
+            value-format="YYYY-MM-DD HH:mm:ss"
             start-placeholder="上次检定开始时间"
             end-placeholder="上次检定结束时间"
           />
@@ -307,7 +280,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" width="120">
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/sample/list/update')"
diff --git a/src/views/customer/sample/list/sample_list_interface.ts b/src/views/customer/sample/list/sample_list_interface.ts
index 26638ce..f10f97a 100644
--- a/src/views/customer/sample/list/sample_list_interface.ts
+++ b/src/views/customer/sample/list/sample_list_interface.ts
@@ -4,7 +4,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -18,7 +18,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/customer/sample/overTime/list.vue b/src/views/customer/sample/overTime/list.vue
index fd39dee..f0e0d95 100644
--- a/src/views/customer/sample/overTime/list.vue
+++ b/src/views/customer/sample/overTime/list.vue
@@ -9,14 +9,16 @@
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
 import { exportOverTimeList, getOverTimeList } from '@/api/customer/overtime'
+import { deleteSample, exportSapmleList, getSampleList } from '@/api/customer/sampleList'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
+
 // 查询条件
 const listQuery: Ref<IOvertimeListQuery> = ref({
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 型号
-  customerId: '', // 委托方代码
+  customerNo: '', // 委托方代码
   customerName: '', // 委托方名称
   startTime: '1', // 检定开始时间
   endTime: '1', // 检定结束时间
@@ -36,7 +38,7 @@
   { text: '样品名称', value: 'sampleName', width: '120', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'evaluationName', align: 'center' },
-  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方代码', value: 'customerNo', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '检定周期', value: 'mesurePeriod', align: 'center' },
   { text: '上次检定时间', value: 'effectiveDate', align: 'center', width: '180px' },
@@ -53,59 +55,18 @@
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getOverTimeList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '1597579843411234817',
-  //     sampleNo: '1', // 样品编号
-  //     sampleName: '1', // 样品名称
-  //     sampleModel: '1', // 型号
-  //     evaluationName: '1', // 出厂编号
-  //     customerId: '1', // 委托方代码
-  //     customerName: '1', // 委托方名称
-  //     mesurePeriod: '1', // 检定周期
-  //     effectiveDate: '1', // 上次检定时间
-  //     remark: '备注', // 备注
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '1597579843411234817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${0}`], // 证书状况
-    },
-    {
-      id: '159784817',
-      sampleNo: 'test', // 样品编号
-      sampleName: 'test', // 样品名称
-      sampleModel: 'test', // 型号
-      evaluationName: 'test', // 出厂编号
-      customerId: 'test', // 委托方代码
-      customerName: 'test', // 委托方名称
-      mesurePeriod: 'test', // 检定周期
-      effectiveDate: 'test', // 上次检定时间
-      certificationStatus: certificationStatusMap[`${1}`], // 证书状况
-    },
-  ]
+  getSampleList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -127,7 +88,7 @@
     sampleNo: '', // 样品编号
     sampleName: '', // 样品名称
     sampleModel: '', // 型号
-    customerId: '', // 委托方代码
+    customerNo: '', // 委托方代码
     customerName: '', // 委托方名称
     startTime: '', // 检定开始时间
     endTime: '', // 检定结束时间
@@ -160,7 +121,7 @@
       sampleNo: listQuery.value.sampleNo, // 样品编号
       sampleName: listQuery.value.sampleName, // 样品名称
       sampleModel: listQuery.value.sampleModel, // 型号
-      customerId: listQuery.value.customerId, // 委托方代码
+      customerNo: listQuery.value.customerNo, // 委托方代码
       customerName: listQuery.value.customerName, // 委托方名称
       startTime: listQuery.value.startTime, // 投诉开始时间
       endTime: listQuery.value.endTime, // 投诉结束时间
@@ -230,7 +191,7 @@
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.customerId"
+          v-model.trim="listQuery.customerNo"
           placeholder="委托方代码"
           clearable
         />
diff --git a/src/views/customer/sample/overTime/overtime_list_interface.ts b/src/views/customer/sample/overTime/overtime_list_interface.ts
index 40b8e64..9b2963d 100644
--- a/src/views/customer/sample/overTime/overtime_list_interface.ts
+++ b/src/views/customer/sample/overTime/overtime_list_interface.ts
@@ -2,7 +2,7 @@
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
   sampleModel: string // 型号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   startTime: string // 检定开始时间
   endTime: string // 检定结束时间
@@ -16,7 +16,7 @@
   sampleName: string // 样品名称
   sampleModel: string // 型号
   evaluationName: string // 出厂编号
-  customerId: string // 委托方代码
+  customerNo: string // 委托方代码
   customerName: string // 委托方名称
   mesurePeriod: string // 检定周期
   effectiveDate: string // 上次检定时间
diff --git a/src/views/device/borrow/components/applyList.vue b/src/views/device/borrow/components/applyList.vue
index 6e8f81a..e43c46a 100644
--- a/src/views/device/borrow/components/applyList.vue
+++ b/src/views/device/borrow/components/applyList.vue
@@ -424,6 +424,7 @@
         <!-- 表格区域 -->
         <normal-table
           id="print"
+          :key="Math.random()"
           :data="list" :total="total" :columns="columns as any"
           :is-showmulti-select="true"
           :query="{ limit: searchQuery.limit, offset: searchQuery.offset }"
diff --git a/src/views/device/receive/applyList.vue b/src/views/device/receive/applyList.vue
index 975a887..d905cc5 100644
--- a/src/views/device/receive/applyList.vue
+++ b/src/views/device/receive/applyList.vue
@@ -3,110 +3,151 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IlistType } from '@/views/device/receive/receive'
-import { exportExcel } from '@/utils/exportXlsx'
 import ButtonBox from '@/views/device/receive/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import { submitApproval } from '@/api/approval'
+import { getDeptTreeList } from '@/api/system/dept'
+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'
 
 const loadingTable = ref(false) // 表格loading
-const active = ref() // 选中的按钮
-const isShowDialog = ref(false) // 是否显示dialog
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
+const active = ref('0') // 选中的按钮
+const approvalDialog = ref() // 审批对话框显隐
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  approvalStatus: '', // 	审批状态
+  processResult: '', // 	处置结果
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
+}
+// 审批状态字典
+const approvalStatusReserveMap: { [key: string]: string } = {
+  '草稿箱': '1',
+  '待审批': '2',
+  '审批中': '3',
+  '已通过': '4',
+  '未通过': '5',
+  '已取消': '6',
+  '非草稿': '7',
+  '未通过-驳回': '8',
+}
 // 表格数据
 const list = ref<IlistType[]>([])
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '名称', value: 'name' },
-  { text: '编号', value: 'number' },
-  { text: '文件号', value: 'fileNumber' },
-  { text: '类别', value: 'type' },
-  { text: '创建人', value: 'createPerson' },
-  { text: '创建时间', value: 'createTime' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+// 筛选时间段数据
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
-
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      fileNumber: 'test', // 文件号
-      type: 'test', // 类别
-      createPerson: 'test', // 创建人
-      createTime: 'test', // 创建时间
-      status: 'test', // 审批状态
-    }]
+  listQuery.value.approvalStatus = active.value
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IlistType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
 
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '', // 	审批状态
+    processResult: '', // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 const $router = useRouter()
+
 // 新建
 const add = () => {
   $router.push({ path: '/receive/add', query: { typeValue: 'add' } })
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -116,19 +157,26 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      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_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用申请列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
@@ -169,10 +217,14 @@
 }
 
 // 操作
-const handleEdit = (index: number, row: IlistType, val: string) => {
+const handleEdit = (row: IlistType, val: string, title = '') => {
   if (val === '取消') {
+    const params = {
+      taskId: row.taskId!,
+      comments: '',
+    }
     ElMessageBox.confirm(
-      '确认取消吗？',
+      '确认取消该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -181,16 +233,18 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '取消成功',
+          })
         })
+        fetchData(true)
       })
   }
   else if (val === '删除') {
     ElMessageBox.confirm(
-      '确认删除吗？',
+      '确认删除该审批吗？',
       '提示',
       {
         confirmButtonText: '确认',
@@ -199,62 +253,90 @@
       },
     )
       .then(() => {
-        // 调取消接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
+        delReceiveApplyList({ 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_CONSUMING_APPROVAL }).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已提交',
+          })
+        })
+        fetchData(true)
+      })
+  }
   else if (val === '同意') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+    approvalDialog.value.initDialog('agree', row.taskId)
   }
   else if (val === '驳回') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+    approvalDialog.value.initDialog('reject', row.taskId)
   }
   else if (val === '拒绝') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+    approvalDialog.value.initDialog('refuse', row.taskId)
   }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/detail', query: { typeValue: 'detail', deviceName: row.name } })
+  else if (val === '查看' || val === '编辑') {
+    $router.push({
+      path: `/receive/${title}`,
+      query: {
+        typeValue: title,
+        approvalStatus: approvalStatusReserveMap[row.approvalStatus],
+        id: row.id,
+        taskId: row.taskId,
+        processId: row.processId, // 查询审批记录使用
+      },
+    })
   }
 }
 // 按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'box') { // 草稿箱
-
-  }
-  else if (val === 'will') { // 未审批
-
-  }
-  else if (val === 'ing') { // 审批中
-
-  }
-  else if (val === 'pass') { // 已通过
-
-  }
-  else if (val === 'notPass') { // 未通过
-
-  }
-  else if (val === 'cancle') { // 已取消
-
-  }
-  else { // 全部
-
-  }
-}
-// 监听关闭对话框
-const closeDialog = () => {
-  isShowDialog.value = false
+  clearList()
 }
 
-fetchData(true)
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -265,38 +347,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -306,8 +382,9 @@
 
     <table-container>
       <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/measure/price/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <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"
@@ -327,51 +404,77 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(row.$index, row, '查看')"
+                @click="handleEdit(row, '查看', 'detail')"
               >
                 查看
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/agree') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '同意')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '同意')"
               >
                 同意
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/reject') && (active === '0' || active === '2')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '驳回')"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '驳回')"
               >
                 驳回
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/refuse') && (active === '0' || active === '2')"
                 size="small"
                 link
-                type="primary"
-                @click="handleEdit(row.$index, row, '拒绝')"
+                type="danger"
+                :disabled="row.approvalStatus !== '待审批' && row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '拒绝')"
               >
                 拒绝
               </el-button>
-              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                :disabled="row.status === '审批中' && row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(row.$index, row, '取消')"
+                @click="handleEdit(row, '编辑', 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/edit') && (active === '1' || active === '6')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '提交')"
+              >
+                提交
+              </el-button>
+              <!-- 是发起者且审批中可以取消 -->
+              <el-button
+                v-if="proxy.hasPerm('/device/receive/applyList/cancle') && (active === '0' || active === '3')"
+                size="small"
+                link
+                type="info"
+                :disabled="row.approvalStatus !== '审批中'"
+                @click="handleEdit(row, '取消')"
               >
                 取消
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                :disabled="row.status === '未通过' || row.status === '已通过' || !row.isStart"
+                v-if="proxy.hasPerm('/device/receive/applyList/delete') && (active !== '4' && active !== '5')"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(row.$index, row, '删除')"
+                :disabled="row.approvalStatus === '未通过' || row.approvalStatus === '已通过'"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -381,7 +484,7 @@
       </normal-table>
     </table-container>
     <button-box :active="active" @changeCurrentButton="changeCurrentButton" />
-    <receive-dialog :is-show-dialog="isShowDialog" :approve-opinion="approveOpinion" @closeDialog="closeDialog" />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/buttonBox.vue b/src/views/device/receive/buttonBox.vue
index aa02ce5..4205fa8 100644
--- a/src/views/device/receive/buttonBox.vue
+++ b/src/views/device/receive/buttonBox.vue
@@ -2,17 +2,16 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '全部', id: 'all' },
-  { name: '草稿箱', id: 'box' },
-  { name: '待审批', id: 'will' },
-  { name: '审批中', id: 'ing' },
-  { name: '已通过', id: 'pass' },
-  { name: '未通过', id: 'notPass' },
-  { name: '已取消', id: 'cancle' },
+  { name: '全部', id: '0' },
+  { name: '草稿箱', id: '1' },
+  { name: '待审批', id: '2' },
+  { name: '审批中', id: '3' },
+  { name: '已通过', id: '4' },
+  { name: '未通过', id: '5' },
+  { name: '已取消', id: '6' },
 ]
-const current = ref('all')
+const current = ref('0')
 watch(current, (newValue) => {
-  console.log(newValue)
   emits('changeCurrentButton', newValue)
 })
 </script>
@@ -38,7 +37,7 @@
 
   .btns {
     position: fixed;
-    top: 76px;
+    top: 69px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/device/receive/createOrCheck.vue b/src/views/device/receive/createOrCheck.vue
index a7456b9..43cedde 100644
--- a/src/views/device/receive/createOrCheck.vue
+++ b/src/views/device/receive/createOrCheck.vue
@@ -1,126 +1,139 @@
 <script lang="ts" setup name="CreateOrCheck">
 import { onMounted, reactive, ref } from 'vue'
 import type { Ref } from 'vue'
+import dayjs from 'dayjs'
 import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { IdeviceList, IdeviceListQuery } from './receive'
 import SelectDeviceDialog from './selectDeviceDialog.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
+import { toTreeList } from '@/utils/structure'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import {
+  getReceiveApplyListDetail,
+  saveAddReceiveApplyList,
+  saveEditReceiveApplyList,
+  submitReceiveApplyList,
+} from '@/api/device/receive'
+import type { userType } from '@/views/system/user/user-interface'
+import type { deptType } from '@/views/device/standingBook/standingBook-interface'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getUserList } from '@/api/system/user'
+import { submitApproval } from '@/api/approval'
+import ApprovalRecord from '@/components/ApprovalRecord/ApprovalRecord.vue'
 
 const $route = useRoute()
-const typeValue = ref()
-const deviceName = ref()
+const approvalDialog = ref() // 审批对话框显隐
+const typeValue = ref() // add、edit、detail
+const approvalStatus = ref() // 审批类型
+const useDeptList = ref<deptType[]>([]) // 部门列表
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
 const isMulti = ref(false) // 是否批量添加(允许多选)
-const selectIndex = ref()
+const selectIndex = ref() // 点击选择的index--点击第几行
 const { proxy } = getCurrentInstance() as any
 const dialogSelectDiviceVisible = ref(false) // 控制选择设备对话框显隐
-const isShowDialog = ref(false) // 控制审批对话框显隐
-const total = ref(20)// 总数
-const approveOpinion = ref() // 审批意见：1同意2驳回0拒绝
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
   detail: '详情',
 }// 字典
-const haveApproveLimits = ref(true)// 是否有审批权限
-const isStart = ref(false)// 是否是发起人
 // 选中的内容
 const checkoutList = ref([])
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '', // 申请说明
+  taskId: '', // 任务id（审批用）
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
 const ruleFormRef = ref<FormInstance>() as any
 const list = ref<IdeviceList[]>([])// 表格数据
+
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 rules = reactive<FormRules>({
-  company: [
-    { required: true, message: '请输入申请单位', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  person: [
-    { required: true, message: '请输入申请人', trigger: 'blur' },
-    // { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
-  ],
-  time: [
-    {
-      type: 'date',
-      required: true,
-      message: '请选择领用时间',
-      trigger: 'change',
-    },
-  ],
+  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'change' }],
+  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  time: [{ type: 'date', required: true, message: '领用时间不能为空', trigger: 'change' }],
+  applyDesc: [{ required: true, message: '申请说明不能为空', trigger: 'blur' }],
 })
 
+const $router = useRouter()
+// 点击关闭
+const close = () => {
+  $router.back()
+}
+
 const handleClick = (val: string) => {
-// 1同意，2驳回，0拒绝，3提交，4撤回
-  if (val === '3') { // 提交
-    ruleFormRef.value.validate((valid: boolean) => {
-      if (valid) {
-        console.log('submit!')
-      }
-      else {
-        console.log('表单提交失败')
-      }
-    })
+  if (val === 'agree') { // 同意
+    approvalDialog.value.initDialog('agree', form.value.taskId)
   }
-  else if (val === '1') {
-    isShowDialog.value = true
-    approveOpinion.value = '1'
+  else if (val === 'reject') { // 驳回
+    approvalDialog.value.initDialog('reject', form.value.taskId)
   }
-  else if (val === '2') {
-    isShowDialog.value = true
-    approveOpinion.value = '2'
+  else if (val === 'refuse') { // 拒绝
+    approvalDialog.value.initDialog('refuse', form.value.taskId)
   }
-  else if (val === '0') {
-    isShowDialog.value = true
-    approveOpinion.value = '0'
+  else if (val === 'revoke') {
+    const params = {
+      taskId: form.value.taskId!,
+      comments: '',
+    }
+    ElMessageBox.confirm(
+      '确认撤回该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        submitApproval('revoke', params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已撤回',
+          })
+        })
+        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)
-}
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
+
 // 删除行
 const delRow = () => {
-  console.log(checkoutList.value)
-
   if (checkoutList.value.length <= 0) {
     ElMessage({
       message: '请选中要删除的行',
@@ -128,88 +141,212 @@
     })
   }
   else {
-    // 调删除接口
     checkoutList.value.forEach((item: IdeviceListQuery) => {
-      // if (!item.name && !item.number) {
       list.value.forEach((element, index) => {
-        if (element.name === item.name && element.number === item.number) {
+        if (element.equipmentNo === item.equipmentNo) {
           list.value.splice(index, 1)
         }
       })
-      // }
     })
   }
 }
+
 // 增加行
 const addRow = () => {
   list.value.push({
-    name: '', // 仪器名称
-    number: '', // 设备编号
-    version: '', // 型号
-    scope: '', // 测量范围
-    dep: '', // 使用部门
-    person: '', // 使用人
-    status: '', // 管理状态
-    date: '', // 有效日期
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    modelNo: '', // 型号
+    mesureRange: '', // 测量范围
+    useDeptName: '', // 使用部门
+    usePersonName: '', // 使用人
+    managerStateName: '', // 管理状态
+    validDate: '', // 有效日期
+    equipmentId: '', // 设备ID
   })
 }
+
 // 点击选择
-const handleSelect = (index: number, row: IdeviceListQuery) => {
-  dialogSelectDiviceVisible.value = true
-  isMulti.value = false
+const handleSelect = (index: number, row: IdeviceList) => {
+  dialogSelectDiviceVisible.value = true // 选择设备对话框显隐
+  isMulti.value = false // 是否单选, false单选、true表格多选
   selectIndex.value = index
-  console.log('选中的index', row)
 }
+
 // 点击批量添加
 const multiAdd = () => {
   dialogSelectDiviceVisible.value = true
   isMulti.value = true
 }
-const $router = useRouter()
-// 点击关闭
-const close = () => {
-  $router.push('/receive/applyList')
-}
+
 // 选择设备对话框关闭
 const closeDialog = () => {
   dialogSelectDiviceVisible.value = false
-  isShowDialog.value = false
 }
-// 选择好设备了
+
+// 选择好设备了, 添加选好的设备到表格中
 const updateDeviceConfirm = (val: Array<IdeviceList>) => {
-  if (isMulti.value) {
-    val.forEach((item: any) => {
-      list.value.push(item)
+  if (isMulti.value) { // 批量增加时push
+    val.forEach((item: IdeviceList) => {
+    // 只添加列表里不存在的
+      const index = list.value.findIndex((i: IdeviceList) => item.equipmentNo === i.equipmentNo)
+      if (index === -1) {
+        list.value.push(item)
+      }
     })
   }
-  else {
+  else { // 单选替换
     list.value.splice(selectIndex.value, 1, val[0])
   }
+
+  // 把选择好的设备添加到列表中后，清除空行
+  const index = list.value.findIndex((item: IdeviceList) => !item.equipmentNo)
+  if (index !== -1) {
+    list.value.splice(index, 1)
+  }
 }
 
+// 保存
+const save = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  ruleFormRef.value.validate((valid: boolean) => {
+    if (valid) {
+      const params = {
+        applyUnit: form.value.applyUnit, // 申请单位
+        applyPerson: form.value.applyPerson, // 申请人
+        time: form.value.time, // 领用时间
+        applyDesc: form.value.applyDesc, // 申请说明
+        applyType: '1', // 申请类型 领用1
+        id: form.value.id,
+        equipmentList: list.value.map((item) => {
+          return {
+            equipmentId: item.id!,
+          }
+        }),
+      }
+      // 新建
+      if (typeValue.value === 'add') {
+        saveAddReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+      // 保存
+      else if (typeValue.value === 'edit') {
+        saveEditReceiveApplyList(params).then((res) => {
+          form.value.id = res.data.id
+          ElMessage.success('保存成功')
+          loading.close()
+        })
+      }
+    }
+    else {
+      console.log('表单校验不通过')
+    }
+  })
+}
+
+// 提交表单
+const submit = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (form.value.id) {
+    const params = {
+      id: form.value.id,
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL, // 表单id
+    }
+    submitReceiveApplyList(params).then(() => {
+      ElMessage.success('提交成功')
+      loading.close()
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
+
+// 获取用户列表--（是否有不分页接口？）
+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)
+    }
+  })
+}
+
+// 审批结束回调
+const approvalSuccess = () => {
+  close()
+}
+
+// 编辑、详情--获取详细信息
+const fetchReceiveApplyListDetail = () => {
+  getReceiveApplyListDetail({ id: form.value.id }).then((res) => {
+    form.value.applyUnit = res.data.applyUnit // 部门
+    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'),
+      }
+    })
+  })
+}
+
 onMounted(() => {
-  typeValue.value = $route.query.typeValue
-  deviceName.value = $route.query.deviceName
+  typeValue.value = $route.query.typeValue // 类型add、edit、detail
+  form.value.id = $route.query.id as string // id
+  form.value.taskId = $route.query.taskId as string // 任务id
+  form.value.processId = $route.query.processId as string // 任务id
+  approvalStatus.value = $route.query.approvalStatus // 审批类型
+  // 编辑、详情获取详情页信息
+  if (typeValue.value === 'edit' || typeValue.value === 'detail') {
+    fetchReceiveApplyListDetail() // 获取详细信息
+  }
+
+  // 获取部门信息
+  fetchDeptTreeList()
+  // 获取人员列表--申请人使用
+  fetchUserList()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="typeValue === 'detail' && deviceName ? `${deviceName}-详情` : `设备领用申请-${textMap[typeValue]}`">
+    <detail-page :title="`设备领用申请-${textMap[typeValue]}`">
       <template #btns>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('1')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('agree')">
           同意
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('2')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('reject')">
           驳回
         </el-button>
-        <el-button v-if="haveApproveLimits && !isStart && typeValue === 'add'" type="primary" @click="handleClick('0')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '2' " type="primary" @click="handleClick('refuse')">
           拒绝
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('3')">
+        <el-button v-if="typeValue === 'add' || typeValue === 'edit'" type="primary" @click="save">
+          保存
+        </el-button>
+        <el-button v-if="typeValue === 'add'" type="primary" @click="submit">
           提交
         </el-button>
-        <el-button v-if="isStart && typeValue === 'add'" type="primary" @click="handleClick('4')">
+        <el-button v-if="typeValue === 'edit' && approvalStatus === '3'" type="primary" @click="handleClick('revoke')">
           撤回
         </el-button>
         <el-button type="info" @click="close">
@@ -219,6 +356,7 @@
     </detail-page>
     <div class="create-check">
       <div class="top-info">
+        <!-- 表单 -->
         <div class="form-area">
           <el-form
             ref="ruleFormRef"
@@ -226,32 +364,46 @@
             label-width="120px"
             :rules="rules"
           >
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="申请单位" prop="company">
-                  <el-input v-model="form.company" clearable :disabled="typeValue === 'detail'" />
-                </el-form-item>
-                <el-form-item label="申请人" prop="person">
-                  <el-input v-model="form.person" clearable :disabled="typeValue === 'detail'" />
+            <el-row :gutter="24">
+              <el-col :span="8">
+                <el-form-item label="申请单位" prop="applyUnit">
+                  <dept-select
+                    v-model="form.applyUnit"
+                    placeholder="请选择申请单位"
+                    :data="useDeptList"
+                    :disabled="typeValue === 'detail'"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
+                <el-form-item label="申请人" prop="applyPerson">
+                  <el-select v-model="form.applyPerson" :disabled="typeValue === 'detail'" placeholder="请选择申请人" 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="8">
                 <el-form-item label="领用时间" prop="time">
                   <el-date-picker
                     v-model="form.time"
                     type="datetime"
                     placeholder="请选择领用时间"
+                    format="YYYY-MM-DD hh:mm"
+                    value-format="YYYY-MM-DD hh:mm"
                     :disabled="typeValue === 'detail'"
                   />
                 </el-form-item>
-                <el-form-item label="申请说明">
-                  <el-input v-model="form.state" type="textarea" clearable :disabled="typeValue === 'detail'" />
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="申请说明" prop="applyDesc">
+                  <el-input v-model="form.applyDesc" type="textarea" autosize clearable :disabled="typeValue === 'detail'" />
                 </el-form-item>
               </el-col>
             </el-row>
           </el-form>
         </div>
       </div>
+      <!-- 表格 -->
       <detail-block title="设备领用列表">
         <template #btns>
           <el-button v-if="typeValue !== 'detail'" type="primary" @click="multiAdd">
@@ -264,55 +416,39 @@
             删除行
           </el-button>
         </template>
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          :is-showmulti-select="typeValue === 'detail' ? false : true" @change="changePage" @multiSelect="handleSelectionChange"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
+          @selection-change="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 v-if="typeValue !== 'detail'" label="操作" align="center" width="60" fixed="right">
-              <template #default="scope">
-                <el-button
-                  size="small"
-                  type="primary"
-                  link
-                  @click="handleSelect(scope.$index, scope.row)"
-                >
-                  选择
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          >
+            <template v-if="item.value === 'equipmentNo' && (typeValue === 'add' || typeValue === 'edit')" #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 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 v-if="typeValue === 'detail'" title="审批流程">
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
     <select-device-dialog
@@ -323,11 +459,7 @@
     />
 
     <!-- 同意、驳回、拒绝对话框显示 -->
-    <receive-dialog
-      :is-show-dialog="isShowDialog"
-      :approve-opinion="approveOpinion"
-      @closeDialog="closeDialog"
-    />
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   </app-container>
 </template>
 
diff --git a/src/views/device/receive/receive.ts b/src/views/device/receive/receive.ts
index d420509..844b717 100644
--- a/src/views/device/receive/receive.ts
+++ b/src/views/device/receive/receive.ts
@@ -1,33 +1,52 @@
+// 设备领用申请筛选
 export interface IlistQuery {
-  number?: string // 编号
-  name?: string // 名称
-  dep?: string // 部门
-  person?: string // 人
+  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
-  number: string // 编号
-  name: string // 名称
-  fileNumber: string// 文件号
-  type: string // 类别
-  createPerson: string // 创建人
-  createTime: string // 创建时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface IsolveListType {
   id: string
-  number: string // 申请编号
-  name: string // 申请名称
-  dep: string // 申请部门
-  person: string// 申请人
-  date: string // 申请时间
-  status: string // 审批状态
+  applyNo: string // 申请编号
+  applyName: string // 申请名称
+  applyUnit: string // 申请部门
+  applyPerson: string // 申请人
+  startTime: string // 申请开始日期
+  endTime: string // 申请结束日期
+  approvalStatus: string // 	审批状态
+  processResult: string // 	处置结果
+  applyType: string // 申请类型 领用0
+  createUser: string // 创建人
+  taskId: string // 任务id
+  processId: string // 流程ID-查询审批记录时使用
 }
 
 export interface Iform {
@@ -36,29 +55,29 @@
   time: string // 申请时间
   state: string // 申请说明
 }
-// 新建-查看表格
+
 export interface IdeviceListQuery {
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  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
-  name: string // 仪器名称
-  number: string // 设备编号
-  version: string // 型号
-  scope: string // 测量范围
-  dep: string // 使用部门
-  person: string // 使用人
-  status: string // 管理状态
-  date: string // 有效日期
+  equipmentName: string // 仪器名称
+  equipmentId: string // 设备ID
+  equipmentNo: string // 设备编号
+  modelNo: string // 型号
+  mesureRange: string // 测量范围
+  useDeptName: string // 使用部门
+  usePersonName: string // 使用人
+  managerStateName: string // 管理状态
+  validDate: string // 有效日期
 }
diff --git a/src/views/device/receive/receiveDialog.vue b/src/views/device/receive/receiveDialog.vue
deleted file mode 100644
index fdaa730..0000000
--- a/src/views/device/receive/receiveDialog.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script lang="ts" setup name="ReceiveDialog">
-import { ref } from 'vue'
-import dayjs from 'dayjs'
-import useUserStore from '@/store/modules/user'
-const props = defineProps({
-  isShowDialog: {
-    type: Boolean,
-    default: false,
-  },
-  approveOpinion: {
-    type: String,
-  },
-})
-const emits = defineEmits(['closeDialog', 'updateConfirm'])
-const userStore = useUserStore()
-const date = dayjs(`${new Date()}`).format('YYYY.MM.DD')
-const dialogTableVisible = ref(false)// 控制对话框显隐
-const selectRadio = ref()// 同意驳回拒绝
-const textarea = ref('')// 审批结论
-watch(() => props.isShowDialog, (newValue) => {
-  dialogTableVisible.value = newValue
-})
-watch(() => props.approveOpinion, (newValue) => {
-  selectRadio.value = newValue
-})
-// 关闭对话框
-const close = () => {
-  console.log('close-dialog')
-  emits('closeDialog')
-}
-// 确认
-const confirm = () => {
-  console.log('确认')
-  const param = {
-    selectRadio: selectRadio.value,
-    textarea,
-    userStore,
-    date,
-  }
-  console.log(param)
-  // emits('updateConfirm', param)
-  // 调接口
-  close()
-}
-</script>
-
-<template>
-  <el-dialog v-model="dialogTableVisible" title="审批操作" class="receive-dialog" @close="close">
-    <div class="receive-dialog-item">
-      <span class="text">审批意见：</span>
-      <!-- 1同意2驳回0拒绝 -->
-      <el-radio-group v-model="selectRadio">
-        <el-radio label="1" :disabled="selectRadio !== '1'">
-          同意
-        </el-radio>
-        <el-radio label="2" :disabled="selectRadio !== '2'">
-          驳回
-        </el-radio>
-        <el-radio label="0" :disabled="selectRadio !== '0'">
-          拒绝
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批结论：</span>
-      <el-input
-        v-model="textarea"
-        :rows="3"
-        type="textarea"
-        placeholder="请输入审批结论"
-      />
-    </div>
-
-    <div class="receive-dialog-item">
-      <span class="text">审批人：{{ userStore.name }}</span>
-      <span class="text">审批时间：{{ date }}</span>
-    </div>
-
-    <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/receive/selectDeviceDialog.vue b/src/views/device/receive/selectDeviceDialog.vue
index 4a9793d..4439958 100644
--- a/src/views/device/receive/selectDeviceDialog.vue
+++ b/src/views/device/receive/selectDeviceDialog.vue
@@ -3,6 +3,8 @@
 import { ref } from 'vue'
 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,
@@ -25,36 +27,15 @@
 const checkoutList = ref([])
 
 const list = ref([])// 表格数据
-const columns = [
-  {
-    text: '设备名称',
-    value: 'name',
-  },
-  {
-    text: '设备编号',
-    value: 'number',
-  },
-  {
-    text: '型号',
-    value: 'version',
-  },
-  {
-    text: '出厂编号',
-    value: 'millNumber',
-  },
-  {
-    text: '管理状态',
-    value: 'status',
-  },
-  {
-    text: '使用人',
-    value: 'person',
-  },
-  {
-    text: '有效日期',
-    value: 'date',
-  },
-]
+const columns = ref<TableColumn[]>([
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { 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)// 控制对话框显隐
 
@@ -62,23 +43,8 @@
 const fetchData = () => {
   loadingTable.value = true
   listPageApi(listQuery.value as any).then((res) => {
-    if (res.code === 200) {
-      list.value = res.data.rows.map((item: any) => {
-        return {
-          ...item,
-          name: item.equipmentName,
-          number: item.equipmentNo,
-          version: item.modelNo,
-          millNumber: item.manufacturingNo,
-          status: item.managerStateName,
-          person: item.usePersonName,
-          date: item.validDate,
-          scope: item.mesureRange,
-          dep: item.useDeptName,
-        }
-      })
-      total.value = res.data.total
-    }
+    list.value = res.data.rows
+    total.value = res.data.total
     loadingTable.value = false
   }).catch((_) => {
     loadingTable.value = false
diff --git a/src/views/device/receive/solveComponent/buttonBox.vue b/src/views/device/receive/solveComponent/buttonBox.vue
index fa155a2..4a4de71 100644
--- a/src/views/device/receive/solveComponent/buttonBox.vue
+++ b/src/views/device/receive/solveComponent/buttonBox.vue
@@ -2,10 +2,10 @@
 import { ref } from 'vue'
 const emits = defineEmits(['changeCurrentButton'])
 const menu = [
-  { name: '未领用', id: 'unused' },
-  { name: '已领用', id: 'used' },
+  { name: '未领用', id: '4' },
+  { name: '已领用', id: '5' },
 ]
-const current = ref('unused')
+const current = ref('4')
 watch(current, (newValue) => {
   console.log(newValue)
   emits('changeCurrentButton', newValue)
@@ -23,7 +23,6 @@
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <!-- <component :is="currentComp" /> -->
   </div>
 </template>
 
diff --git a/src/views/device/receive/solveComponent/detail.vue b/src/views/device/receive/solveComponent/detail.vue
index 98730d8..53a8f39 100644
--- a/src/views/device/receive/solveComponent/detail.vue
+++ b/src/views/device/receive/solveComponent/detail.vue
@@ -1,119 +1,127 @@
 <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 type { IdeviceListQuery, Iform } from '../receive'
-const props = defineProps({
-  typeValue: String,
-})
+import dayjs from 'dayjs'
+import type { IdeviceList, IdeviceListQuery } from '../receive'
+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 deviceName = ref()
-
 // 表单数据
 const form = ref({
-  company: '申请单位', // 申请单位
-  person: '申请人1', // 申请人
-  time: '1', // 领用时间
-  state: '说明1', // 申请说明
+  id: '',
+  processId: '', // 流程id--查询审批记录使用
+  applyUnit: '', // 申请单位
+  applyPerson: '', // 申请人
+  time: '', // 领用时间
+  applyDesc: '', // 申请说明
 })
-const list = ref([{
-  name: '测试1', // 仪器名称
-  number: '测试1', // 设备编号
-  version: '测试1', // 型号
-  scope: '测试1', // 测量范围
-  dep: '测试1', // 使用部门
-  person: '测试1', // 使用人
-  status: '测试1', // 管理状态
-  date: '测试1', // 有效日期
-}, {
-  name: '测试2', // 仪器名称
-  number: '测试2', // 设备编号
-  version: '测试2', // 型号
-  scope: '测试2', // 测量范围
-  dep: '测试2', // 使用部门
-  person: '测试2', // 使用人
-  status: '测试2', // 管理状态
-  date: '测试2', // 有效日期
-}])// 表格数据
+const list = ref<IdeviceList[]>([])// 表格数据
 // 查询条件
 const listQuery: Ref<IdeviceListQuery> = ref({
-  name: '', // 仪器名称
-  number: '', // 设备编号
-  version: '', // 型号
-  scope: '', // 测量范围
-  dep: '', // 使用部门
-  person: '', // 使用人
-  status: '', // 管理状态
-  date: '', // 有效日期
+  equipmentName: '', // 仪器名称
+  equipmentNo: '', // 设备编号
+  modelNo: '', // 型号
+  mesureRange: '', // 测量范围
+  useDeptName: '', // 使用部门
+  usePersonName: '', // 使用人
+  managerStateName: '', // 管理状态
+  validDate: '', // 有效日期
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
-const columns = [
-  { text: '仪器名称', value: 'name' },
-  { text: '设备编号', value: 'number' },
-  { text: '型号', value: 'version' },
-  { text: '测量范围', value: 'scope' },
-  { text: '使用部门', value: 'dep' },
-  { text: '使用人', value: 'person' },
-  { text: '管理状态', value: 'status' },
-  { text: '有效日期', value: 'date' },
-]
+// 表头
+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 changePage = (val: { size?: number; page?: number }) => {
-  if (val && val.size) {
-    listQuery.value.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.value.offset = val.page
-  }
-  // fetchData(true)
+// 编辑、详情--获取详细信息
+const 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.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.push('/receive/solveList')
+  $router.back()
 }
+
 // 打印
 const printObj = ref({
   id: 'lysq', // 需要打印元素的id
-  popTitle: '领用申请', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  popTitle: '设备领用详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>设备领用详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
   preview: false, // 是否启动预览模式，默认是false
-  // 触发打印预览打开前回调
-  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') },
-  // 触发打开打印预览回调
-  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') },
-  // 触发打印工具打开前回调
-  beforeOpenCallback() { console.log('开始打印之前！') },
-  // 触发打开打印工具回调
-  openCallback() { console.log('执行打印了！') },
-  // 触发关闭打印工具回调
-  closeCallback() { console.log('关闭了打印工具！') },
-  // 触发点击打印回调
-  clickMounted() { console.log('点击v-print绑定的按钮了！') },
-  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
-  // asyncUrl (reslove) {
-  //   setTimeout(() => {
-  //     reslove('http://localhost:8080/')
-  //   }, 2000)
-  // },
   standard: '',
   extarCss: '',
 })
 
-onMounted(() => {
-  deviceName.value = $route.query.deviceName
+// 获取用户列表--（是否有不分页接口？）
+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="deviceName ? `${deviceName}-详情` : '设备领用处理-详情'">
+    <detail-page title="设备领用处理-详情">
       <template #btns>
         <el-button v-if="proxy.hasPerm('/measure/measureSource/print')" v-print="printObj" type="primary">
           打印
@@ -132,26 +140,37 @@
               :model="form"
               label-width="120px"
             >
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="申请单位">
-                    <el-input v-model="form.company" clearable disabled />
-                  </el-form-item>
-                  <el-form-item label="申请人">
-                    <el-input v-model="form.person" clearable disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="领用时间">
-                    <el-date-picker
-                      v-model="form.time"
-                      type="datetime"
-                      placeholder="请选择领用时间"
+              <el-row :gutter="24">
+                <el-col :span="8">
+                  <el-form-item label="申请单位" prop="applyUnit">
+                    <dept-select
+                      v-model="form.applyUnit"
+                      :data="useDeptList"
                       disabled
                     />
                   </el-form-item>
-                  <el-form-item label="申请说明">
-                    <el-input v-model="form.state" type="textarea" clearable disabled />
+                </el-col>
+                <el-col :span="8">
+                  <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="8">
+                  <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="16">
+                  <el-form-item label="申请说明" prop="applyDesc">
+                    <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -160,41 +179,27 @@
         </detail-block>
       </div>
       <detail-block title="设备领用列表">
-        <normal-table
-          :data="list" :total="total" :columns="columns" :query="listQuery"
-          @change="changePage"
+        <el-table
+          :data="list"
+          border
+          style="width: 100%;"
+          max-height="600"
         >
-          <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>
-        </normal-table>
+          <el-table-column 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"
+            :width="item.width"
+            show-overflow-tooltip
+            align="center"
+          />
+        </el-table>
       </detail-block>
-
       <detail-block 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>
+        <approval-record :process-id="form.processId" />
       </detail-block>
     </div>
   </app-container>
diff --git a/src/views/device/receive/solveList.vue b/src/views/device/receive/solveList.vue
index 9ed5e66..adf5fa0 100644
--- a/src/views/device/receive/solveList.vue
+++ b/src/views/device/receive/solveList.vue
@@ -3,29 +3,60 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IlistQuery, IsolveListType } from '@/views/device/receive/receive'
 import ButtonBox from '@/views/device/receive/solveComponent/buttonBox.vue'
-import ReceiveDialog from '@/views/device/receive/receiveDialog.vue'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDeptTreeList } from '@/api/system/dept'
+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 {
+  delReceiveApplyList,
+  exportReceiveApplyList,
+  getReceiveApplyList,
+  updateProcessResult,
+} from '@/api/device/receive'
 
+const usePersonList = ref<userType[]>([]) // 申请人列表（用户）
+const useDeptList = ref<deptType[]>([]) // 部门列表
 const loadingTable = ref(false) // 表格loading
-const active = ref('unused') // 选中的按钮
-const type = {
-  check: '查看',
-  normal: '正常',
+const active = ref('4') // 选中的按钮
+
+// 审批状态字典
+const approvalStatusMap: { [key: string]: string } = {
+  1: '草稿箱',
+  2: '待审批',
+  3: '审批中',
+  4: '已通过',
+  5: '未通过',
+  6: '已取消',
+  7: '非草稿',
+  8: '未通过-驳回',
 }
+
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
-  number: '', // 编号
-  name: '', // 名称
-  dep: '', // 部门
-  person: '', // 人
-  startTime: '', // 申请开始日期
-  endTime: '', // 申请结束日期
+  applyNo: '', // 申请编号
+  applyName: '', // 申请名称
+  applyUnit: '', // 申请部门id
+  applyUnitName: '', // 申请部门名称
+  applyPerson: '', // 申请人id
+  applyPersonName: '', // 申请人姓名
+  startTime: '', // 领用开始日期
+  endTime: '', // 领用结束日期
+  equipmentApplyProcessResult: '4', // 设备申请处理结果--4待领用、5已领用
+  approvalStatus: '4', // 审批状态--已通过
+  processResult: '4', // 	处置结果--4待领用、5已领用
+  applyType: '1', // 申请类型 领用1
+  createUser: '', // 创建人
+  formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const timeRange = ref<[DateModelType, DateModelType]>(['', ''])
 
@@ -35,71 +66,76 @@
 // 总数
 const total = ref(20)
 // 表头
-const columns = ref([
-  { text: '申请编号', value: 'number' },
-  { text: '申请名称', value: 'name' },
-  { text: '申请部门', value: 'dep' },
-  { text: '申请人', value: 'person' },
-  { text: '申请时间', value: 'date' },
-  { text: '审批状态', value: 'status' },
+const columns = ref<TableColumn[]>([
+  { 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: 'approvalStatus', align: 'center' },
 ])
 // 选中的内容
 const checkoutList = ref<string[]>([])
+
 // 重置
 const clearList = () => {
-  listQuery.value.number = ''
-  listQuery.value.name = ''
-  listQuery.value.dep = ''
-  listQuery.value.person = ''
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value = {
+    applyNo: '', // 申请编号
+    applyName: '', // 申请名称
+    applyUnit: '', // 申请部门
+    applyPerson: '', // 申请人
+    startTime: '', // 申请开始日期
+    endTime: '', // 申请结束日期
+    approvalStatus: '4', // 	审批状态--已通过
+    processResult: active.value, // 	处置结果
+    applyType: '1', // 申请类型 领用1
+    createUser: '', // 创建人
+    formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+    equipmentApplyProcessResult: active.value, // 设备申请处理结果
+    offset: 1,
+    limit: 20,
+  }
+  timeRange.value = ['', '']
+  fetchData(true)
 }
+
 // 数据查询
 function fetchData(isNowPage = false) {
-  // loadingTable.value = true
+  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 || ''
-  // getSampleList(listQuery.value).then((response) => {
-  // 模拟数据
+  listQuery.value.equipmentApplyProcessResult = active.value // 设备申请处理结果4待领用5已领用
+  // ------------------processResult为4时先传空、接口修改后再正常传4-----
+  if (listQuery.value.processResult === '4') {
+    listQuery.value.processResult = ''
+  }
 
-  // response.data.rows = [
-  //   {
-  //     id: '122',
-  //     number: 'test', // 编号
-  //     name: 'test', // 名称
-  //     fileNumber: 'test', // 文件号
-  //     type: 'test', // 类别
-  //     createPerson: 'test', // 创建人
-  //     createTime: 'test', // 创建时间
-  //     status: 'test', // 审批状态
-  //   }]
-  //   list.value = response.data.rows
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // })
-  list.value = [
-    {
-      id: '122',
-      number: 'test', // 编号
-      name: 'test', // 名称
-      dep: 'test', // 文件号
-      person: 'test', // 类别
-      date: 'test', // 创建人
-      status: 'test', // 审批状态
-    }]
+  getReceiveApplyList(listQuery.value).then((response) => {
+    list.value = response.data.rows.map((item: IsolveListType) => {
+      return {
+        ...item,
+        approvalStatus: approvalStatusMap[item.approvalStatus],
+      }
+    })
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
 }
+
 // 搜索
 const searchList = () => {
   fetchData(true)
 }
+
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
+
 // 导出
 const exportAll = () => {
   const loading = ElLoading.service({
@@ -109,25 +145,34 @@
   })
   if (list.value.length > 0) {
     const params = {
-      number: listQuery.value.number, // 样品编号
-      name: listQuery.value.name, // 样品名称
-      dep: listQuery.value.dep, // 型号
-      person: listQuery.value.person, // 委托方代码
-      startTime: listQuery.value.startTime, // 委托方名称
-      endTime: listQuery.value.endTime, // 投诉开始时间
+      applyNo: listQuery.value.applyNo, // 申请编号
+      applyName: listQuery.value.applyName, // 申请名称
+      applyUnit: listQuery.value.applyUnit, // 申请部门
+      applyPerson: listQuery.value.applyPerson, // 申请人
+      startTime: listQuery.value.startTime, // 申请开始日期
+      endTime: listQuery.value.endTime, // 申请结束日期
+      equipmentApplyProcessResult: listQuery.value.equipmentApplyProcessResult, // 设备申请处理结果--4待领用、5已领用
+      approvalStatus: listQuery.value.approvalStatus, // 	审批状态
+      processResult: listQuery.value.processResult, // 	处置结果
+      applyType: listQuery.value.applyType, // 申请类型 领用1
+      createUser: listQuery.value.createUser, // 创建人
+      formId: SCHEDULE.DEVICE_CONSUMING_APPROVAL,
+      offset: 1,
+      limit: 20,
       ids: checkoutList.value,
     }
     // 调导出接口
-    // exportSapmleList(params).then((res) => {
-    //   const blob = new Blob([res.data])
-    //   exportFile(blob, '设备领用申请列表.xlsx')
-    // })
+    exportReceiveApplyList(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '设备领用处理列表.xlsx')
+    })
   }
   else {
     ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
+
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
   if (val && val.size) {
@@ -138,6 +183,7 @@
   }
   fetchData(true)
 }
+
 // 打印列表
 function printList() {
   // 打印列
@@ -161,83 +207,79 @@
 
 // 操作
 const $router = useRouter()
-const handleEdit = (index: number, row: IsolveListType, val: string) => {
-  if (val === '领用') {
-    ElMessageBox.confirm(
-      '确认领用吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
+const handleEdit = (row: IsolveListType, val: string) => {
+  if (val === '查看') {
+    $router.push({
+      path: '/receive/solveDetail',
+      query: {
+        id: row.id,
+        processId: row.processId, // 查询审批记录使用
       },
+    })
+  }
+  else {
+    ElMessageBox.confirm(
+    `确认${val}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
     )
       .then(() => {
-        // 调领用接口
-        ElMessage({
-          type: 'success',
-          message: '领用成功',
-        })
+        if (val === '领用' || val === '退领') {
+          const processResult = val === '领用' ? '5' : '4'
+          updateProcessResult({ id: row.id, processResult }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
+        if (val === '删除') {
+          delReceiveApplyList({ id: row.id, taskId: row.taskId }).then(() => {
+            ElMessage.success(`已${val}`)
+            fetchData(true)
+          })
+        }
       })
   }
-  else if (val === '删除') {
-    ElMessageBox.confirm(
-      '确认删除吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调删除接口
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-      })
-  }
-  else if (val === '退领') {
-    ElMessageBox.confirm(
-      '确认退领吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    )
-      .then(() => {
-        // 调退领接口
-        ElMessage({
-          type: 'success',
-          message: '退领成功',
-        })
-      })
-  }
-  else if (val === '查看') {
-    $router.push({ path: '/receive/solveDetail', query: { deviceName: row.name } })
-  }
 }
+
 // 右上角按钮切换
 const changeCurrentButton = (val: string) => {
-  clearList()
-  console.log('button 切换', val)
   active.value = val
-  if (val === 'unused') { // 未领用
-
-  }
-  else if (val === 'used') { // 已领用
-
-  }
+  listQuery.value.equipmentApplyProcessResult = val // 处理结果--4待领用、5已领用
+  listQuery.value.processResult = val // 处理结果--4待领用、5已领用
+  clearList()
 }
+
 // 标签识别
 const execTag = () => {
 
 }
 
-fetchData(true)
+// 获取用户列表
+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(() => {
+  fetchData(true)
+  // 获取使用部门
+  fetchDeptTreeList()
+  fetchUserList()
+})
 </script>
 
 <template>
@@ -248,38 +290,32 @@
     >
       <search-item>
         <el-input
-          v-model.trim="listQuery.number"
+          v-model.trim="listQuery.applyNo"
           placeholder="申请编号"
           clearable
         />
       </search-item>
       <search-item>
         <el-input
-          v-model.trim="listQuery.name"
+          v-model.trim="listQuery.applyName"
           placeholder="申请名称"
           clearable
         />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.dep"
-          placeholder="申请部门"
-          clearable
-        />
+        <dept-select v-model="listQuery.applyUnit" placeholder="请选择申请部门" :data="useDeptList" />
       </search-item>
       <search-item>
-        <el-input
-          v-model.trim="listQuery.person"
-          placeholder="申请人"
-          clearable
-        />
+        <el-select v-model="listQuery.applyPerson" placeholder="请选择申请人" style="width: 100%;">
+          <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </search-item>
       <search-item>
         <el-date-picker
           v-model="timeRange"
-          type="datetimerange"
+          type="daterange"
           range-separator="到"
-          format="YYYY/MM/DD"
+          format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
           start-placeholder="申请开始日期"
           end-placeholder="申请结束日期"
@@ -290,8 +326,8 @@
     <table-container>
       <template #btns-right>
         <icon-button icon="icon-device" title="标签识别" @click="execTag" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/measure/price/print')" v-print="printList" icon="icon-print" title="打印" type="primary" />
+        <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"
@@ -311,35 +347,35 @@
                 size="small"
                 type="primary"
                 link
-                @click="handleEdit(scope.$index, scope.row, '查看')"
+                @click="handleEdit(scope.row, '查看')"
               >
                 查看
               </el-button>
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '领用')"
+                @click="handleEdit(scope.row, '领用')"
               >
                 领用
               </el-button>
               <!-- 发起者和有删除权限的可以删除，已通过未通过状态不可以删除 -->
               <el-button
-                v-if="active === 'unused'"
+                v-if="active === '4'"
                 size="small"
                 link
                 type="danger"
-                @click="handleEdit(scope.$index, scope.row, '删除')"
+                @click="handleEdit(scope.row, '删除')"
               >
                 删除
               </el-button>
               <el-button
-                v-if="active === 'used'"
+                v-if="active === '5'"
                 size="small"
                 link
                 type="primary"
-                @click="handleEdit(scope.$index, scope.row, '退领')"
+                @click="handleEdit(scope.row, '退领')"
               >
                 退领
               </el-button>
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index c7363ea..a58b89e 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -25,6 +25,7 @@
 const name = ref('')
 const borrowList = ref<borrowDeviceType[]>([])
 const ruleForm1 = ref({
+  applyType: $route.query.applyType, // 申请类型
   applyDesc: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
@@ -195,7 +196,8 @@
       console.log(row.id)
       detailApply({ id: row.id }).then((res) => {
         ruleForm2.value = res.data
-        borrowList.value = res.data.equipmentList
+        // borrowList.value = res.data.equipmentList 接口返回数据为空
+        borrowList.value = res.data.equipmentInfoList
       })
     }
   }
@@ -234,23 +236,44 @@
         ).then(() => {
           if (borrowList.value.length) {
             // 整理数据
+            delete ruleForm2.value.equipmentInfoList // 去除显示的列表
             const params = {
               ...ruleForm2.value,
               equipmentList: borrowList.value.map(item => ({
+                id: ruleForm2.value.id,
                 equipmentId: item.id,
               })),
               applyType: '1',
             }
-            title.value === '新建'
-              // eslint-disable-next-line multiline-ternary
-              ? addApply(params) : editApply(params)
-                .then((res) => {
-                  if (res.code === 200) {
-                    // 成功
-                    ElMessage.success('操作成功')
-                    $router.go(-1)
-                  }
-                })
+            // title.value === '新建'
+
+            // ? addApply(params) : editApply(params)
+            //   .then((res) => {
+            //     console.log(res)
+            //     if (res.code === 200) {
+            //       // 成功
+            //       ElMessage.success('操作成功')
+            //       $router.go(-1)
+            //     }
+            //   })
+            if (title.value === '新建') {
+              addApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
+            else {
+              editApply(params).then((res) => {
+                if (res.code === 200) {
+                  // 成功
+                  ElMessage.success('操作成功')
+                  $router.go(-1)
+                }
+              })
+            }
           }
           else {
             ElMessage.warning('请先添加借用设备')
@@ -274,7 +297,13 @@
           },
         ).then((res) => {
           addStatus(ruleForm1.value).then((res) => {
-            console.log(res)
+            if (res.code === 200) {
+              ElMessage.success('操作成功!')
+              $router.go(-1)
+            }
+            else {
+              ElMessage.warning(res.message)
+            }
           })
         })
       }
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 5b7e91a..e630e24 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -37,6 +37,7 @@
   ids: [] as string[],
   limit: 20,
   offset: 1,
+  applyType: props.applyType, // 申请类型
 }) // 查询参数
 const loadingTable = ref<boolean>(false) // 表格loading
 const total = ref<number>(0) // 数据总条数
diff --git a/src/views/device/stateManage/handleApply.vue b/src/views/device/stateManage/handleApply.vue
index b2c2357..6220262 100644
--- a/src/views/device/stateManage/handleApply.vue
+++ b/src/views/device/stateManage/handleApply.vue
@@ -4,7 +4,8 @@
 
 <template>
   <app-container>
-    <page name="设备处置申请" authority="handleApply" apply-type="6" />
+    <!-- 重新修改apply-type值 -->
+    <page name="设备处置申请" authority="handleApply" apply-type="10" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/openApply.vue b/src/views/device/stateManage/openApply.vue
index 744f0f3..ffa254e 100644
--- a/src/views/device/stateManage/openApply.vue
+++ b/src/views/device/stateManage/openApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备启封申请" authority="openApply" apply-type="4" />
+    <page name="设备启封申请" authority="openApply" apply-type="5" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/scrapApply.vue b/src/views/device/stateManage/scrapApply.vue
index 94c6475..6b200a8 100644
--- a/src/views/device/stateManage/scrapApply.vue
+++ b/src/views/device/stateManage/scrapApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备报废申请" authority="scrapApply" apply-type="5" />
+    <page name="设备报废申请" authority="scrapApply" apply-type="6" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/sealupApply.vue b/src/views/device/stateManage/sealupApply.vue
index a9e6733..dadeccd 100644
--- a/src/views/device/stateManage/sealupApply.vue
+++ b/src/views/device/stateManage/sealupApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备封存申请" authority="sealupApply" apply-type="3" />
+    <page name="设备封存申请" authority="sealupApply" apply-type="4" />
   </app-container>
 </template>
 
diff --git a/src/views/device/stateManage/unusedApply.vue b/src/views/device/stateManage/unusedApply.vue
index 8f15c63..5be5c8a 100644
--- a/src/views/device/stateManage/unusedApply.vue
+++ b/src/views/device/stateManage/unusedApply.vue
@@ -4,7 +4,7 @@
 
 <template>
   <app-container>
-    <page name="设备闲置申请" authority="unusedApply" apply-type="2" />
+    <page name="设备闲置申请" authority="unusedApply" apply-type="3" />
   </app-container>
 </template>
 
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 8f2225c..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="sourceApprove">
 // 溯源供方审批列表
+import { rowContextKey } from 'element-plus'
 import ListApproval from './components/listApproval.vue' // 全部
 import type { IButton } from './list_interface'
 import useDictStore from '@/store/modules/dict'
@@ -22,14 +23,14 @@
 const buttonsSet: { [key: string]: IButton[] } = {
   全部: [{ name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
+    { name: '驳回', type: 'primary', show(row: { decisionItem: number }) { console.log(row.decisionItem); return row.decisionItem !== 3 } },
+    { name: '拒绝', type: 'danger', show(row: { decisionItem: number }) { return row.decisionItem !== 2 } },
     { name: '取消', type: 'info' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
+    { name: '编辑', type: 'primary' },
     { name: '提交', type: 'primary' },
     { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
@@ -38,7 +39,7 @@
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
+    { name: '删除', type: 'danger' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index ecf804d..c0be801 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -8,7 +8,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
     type: String,
@@ -59,7 +59,7 @@
   { text: '联系方式', value: 'phone', align: 'center' },
   { text: '地址', value: 'address', align: 'center' },
   { text: '创建时间', value: 'name', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110px' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -105,7 +105,6 @@
   id: string
   supplierName: string
 }
-const buttonTypeMap = ref('')
 // 点击删除或者取消
 const handleDelete = (row: rowReturn) => {
   ElMessageBox.confirm(
@@ -132,8 +131,8 @@
 // 取消
 const handleCancel = (row: ISupplier) => {
   const params = {
-    taskId: row.taskId!,
-    comments: '',
+    processInstanceId: row.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -143,16 +142,12 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-        fetchData(true)
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
+      fetchData(true)
     })
+  })
 }
 
 const approvalDialog = ref()
@@ -161,9 +156,7 @@
 const searchList = () => {
   fetchData(false)
 }
-const cancelEvent = () => {
-  console.log('cancel!')
-}
+
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -283,6 +276,11 @@
   }
 }
 
+// 驳回后编辑
+function editAgain(row: ISupplier) {
+  $router.push(`/source/edit/${row.id}?from=reject`)
+}
+
 // 监听status变化，更新approvalStatus
 watch (
   () => props.status,
@@ -349,16 +347,34 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" :width="operationWidth">
+            <el-table-column label="操作" align="center" :width="160">
               <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttons"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="clickBtn(row, item.name)"
-                >
-                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
+                <el-button size="small" type="primary" link @click="clickBtn(row, '查看')">
+                  查看
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '编辑')">
+                  编辑
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '未通过-驳回'" size="small" type="primary" link @click="editAgain(row)">
+                  编辑
+                </el-button>
+                <el-button v-if="listQuery.approvalStatus === '1'" size="small" type="primary" link @click="clickBtn(row, '提交')">
+                  提交
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批'" size="small" type="primary" link @click="clickBtn(row, '同意')">
+                  同意
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 3" size="small" type="primary" link @click="clickBtn(row, '驳回')">
+                  驳回
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '待审批' && row.decisionItem !== 2" size="small" type="primary" link @click="clickBtn(row, '拒绝')">
+                  拒绝
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '审批中'" size="small" type="primary" link @click="clickBtn(row, '取消')">
+                  取消
+                </el-button>
+                <el-button v-if="row.approvalStatusName === '草稿箱' || row.approvalStatusName === '审批中' || proxy.hasPerm('/meter/supplier/approval/operate/delete')" size="small" type="primary" link @click="handleDelete(row)">
+                  删除
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
index 9f8f277..7b89b15 100644
--- a/src/views/measure/source/components/sourceApprovalDetail.vue
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -6,24 +6,13 @@
 import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
 import baseInfoDetail from './baseInfoDetail.vue'
 import { getSoucreListDetail } from '@/api/measure/source'
-import { submitApproval } from '@/api/approval'
+import { cancelApproval, submitApproval } from '@/api/approval'
 const infoId = ref('') // id
-const buttonArray = ref<IButton[]>([])
-
-const buttonsSet: { [key: string]: IButton[] } = {
-  2: [{ name: '查看', type: 'primary' },
-    { name: '同意', type: 'primary' },
-    { name: '驳回', type: 'primary' },
-    { name: '拒绝', type: 'danger' },
-  ],
-  3: [
-    { name: '取消', type: 'primary' },
-  ],
-}
+const approvalType = ref('')
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
-  const status = $route.params.type
+  approvalType.value = $route.params.type as string
   if ($route.params.id) {
     infoId.value = $route.params.id as string
   }
@@ -44,6 +33,10 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
+  companyAreaName: '',
+  companyCityName: '',
+  companyCountryName: '',
+  companyProvinceName: '',
   createTime: '',
   director: '',
   fax: '',
@@ -52,6 +45,10 @@
   invoiceCity: '',
   invoiceCountry: '',
   invoiceProvince: '',
+  invoiceAreaName: '',
+  invoiceCityName: '',
+  invoiceCountryName: '',
+  invoiceProvinceName: '',
   mailbox: '',
   minioFileName: '',
   mobile: '',
@@ -66,16 +63,6 @@
 const getInfo = () => {
   getSoucreListDetail({ id: infoId.value }).then((res) => {
     dataForm.value = res.data
-    if (dataForm.value.approvalStatus) {
-      // 待审批
-      if (dataForm.value.approvalStatus == '2') {
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-      else if (dataForm.value.approvalStatus == '3') { // 审批中
-        // todo：判断当前用户是否为发起人
-        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
-      }
-    }
   })
 }
 getInfo()
@@ -122,8 +109,8 @@
 // 取消
 const handleCancel = () => {
   const params = {
-    taskId: dataForm.value.taskId!,
-    comments: '',
+    processInstanceId: dataForm.value.processId!,
+    comments: '取消审批',
   }
   ElMessageBox.confirm(
     '确认取消该审批吗？',
@@ -133,15 +120,11 @@
       cancelButtonText: '取消',
       type: 'warning',
     },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
-      })
+  ).then(() => {
+    cancelApproval(params).then((res) => {
+      ElMessage.success('取消成功')
     })
+  })
 }
 const approvalDialog = ref()
 // 点击数据后的操作按钮
@@ -167,8 +150,17 @@
   <app-container>
     <detail-page title="溯源供方审批">
       <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" :type="item.type" @click="clickBtn(item.name)">
-          {{ item.name }}
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('同意')">
+          同意
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="approvalType === '2'" type="primary" @click="clickBtn('驳回')">
+          驳回
+        </el-button>
+        <el-button v-if="approvalType === '3'" type="primary" @click="handleCancel()">
+          取消
         </el-button>
         <el-button type="info" @click="close">
           关闭
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index 42ee37f..1376cc2 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -298,12 +298,12 @@
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
-          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="140">
+            <el-table-column label="操作" align="center" width="90">
               <template #default="{ row }">
-                <el-button
+                <!-- <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
                   size="small"
                   type="primary"
@@ -311,22 +311,11 @@
                   @click="handleEdit(row, 'edit')"
                 >
                   编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row, 'detail')"
-                >
+                </el-button> -->
+                <el-button size="small" link type="primary" @click="handleEdit(row, 'detail')">
                   详情
                 </el-button>
-                <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
+                <el-button v-if="proxy.hasPerm('/measure/measureSource/delete')" size="small" link type="danger" @click="handleDelete(row.$index, row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index bfe2463..9eb25b4 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -9,7 +9,7 @@
 import type { ISupplier, traceSupplierPerson } from './list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit } from '@/api/measure/source'
+import { getSoucreListDetail, getSoucreListlevelType, sourceDraftUpdate, sourceSave, sourceSubmit, updateSourceApproval } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import type { IAddress } from '@/components/AddressSelect/address-interface'
@@ -23,6 +23,7 @@
   add: '新建',
   detail: '详情',
 }// 字典
+const fromPage = ref('') // 来自于草稿箱还是驳回
 // 从路由中获取页面类型参数
 const $route = useRoute()
 if ($route.params && $route.params.type) {
@@ -31,6 +32,10 @@
     infoId.value = $route.params.id as string
   }
 }
+
+if ($route.query && $route.query.from) {
+  fromPage.value = $route.query.from as string
+}
 const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
@@ -250,32 +255,39 @@
           type: 'warning',
         },
       ).then(() => {
-        // 如果id存在, 调用更新接口
-        if (formInline.value.id) {
+        if (fromPage.value == 'reject') { // 驳回调用驳回编辑接口
+          updateSourceApproval(formInline.value).then((res) => {
+            ElMessage.success('提交成功!')
+          })
+        }
+        else {
+          // 如果id存在, 调用更新接口
+          if (formInline.value.id) {
           // 如果表单变更过,先保存，再提交
-          if (isChanged.value) {
-            sourceDraftUpdate(formInline.value).then((res) => {
+            if (isChanged.value) {
+              sourceDraftUpdate(formInline.value).then((res) => {
+                if (res.code === 200) {
+                  submitFunc()
+                }
+                else {
+                  ElMessage.error('保存失败，请重新保存后提交')
+                }
+              })
+            }
+            else { // 表单未变更过，直接提交
+              submitFunc()
+            }
+          }
+          else {
+          // id不存在，调用保存接口，再提交
+            sourceSave(formInline.value).then((res) => {
               if (res.code === 200) {
+                formInline.value.id = res.data.id
+                formInline.value.supplierNo = res.data.supplierNo
                 submitFunc()
               }
-              else {
-                ElMessage.error('保存失败，请重新保存后提交')
-              }
             })
           }
-          else { // 表单未变更过，直接提交
-            submitFunc()
-          }
-        }
-        else {
-          // id不存在，调用新建接口
-          sourceSave(formInline.value).then((res) => {
-            if (res.code === 200) {
-              formInline.value.id = res.data.id
-              formInline.value.supplierNo = res.data.supplierNo
-              submitFunc()
-            }
-          })
         }
       })
     }
@@ -337,7 +349,7 @@
         <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="pageType !== 'detail' && fromPage !== 'reject'" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
         <el-button type="info" @click="close">
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 105dc2e..a75febd 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -89,9 +89,11 @@
   taxNumber: string // 税号
   website: string //	网址
   traceSupplierPersonList: traceSupplierPerson [] // 溯源供方人员列表
-  taskId?: '' // 任务id, 流程审批用
+  taskId?: string // 任务id, 流程审批用
+  processId?: string // 流程实例id
   approvalStatus?: string // 审批状态
   approvalStatusName?: string // 审批状态名称
+  decisionItem?: number // 可选决策项（1同意驳回拒绝 2同意驳回 3同意拒绝，用于待审批列表同意/驳回/拒绝按钮展示）
 }
 
 export interface IlistTypes {
@@ -108,8 +110,8 @@
 }
 
 export interface IButton {
-  name: string
+  name: string // 按钮名称
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
-  permission?: string
-  proxy?: string
+  proxy?: string // 权限
+  show?: Function // 是否显示
 }
diff --git a/src/views/setting.vue b/src/views/setting.vue
index aa181ed..3861f14 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -158,7 +158,7 @@
     processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
-  workFlowStore.setIsTried(true)
+  // workFlowStore.setIsTried(true)
   tipList.value = []
   reErr(processConfig.value.nodeConfig) // 统计空节点
   if (tipList.value.length != 0) { // 存在空节点
diff --git a/src/views/system/tool/autograph/addDDialog.vue b/src/views/system/tool/autograph/addDDialog.vue
index daadd9b..ef78067 100644
--- a/src/views/system/tool/autograph/addDDialog.vue
+++ b/src/views/system/tool/autograph/addDDialog.vue
@@ -158,7 +158,7 @@
 <template>
   <el-dialog v-if="dialogVisible" v-model="dialogVisible" :title="title" width="50%" append-to-body class="container" @close="resetForm">
     <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-position="right" label-width="110px" :class="[title === '详情' ? 'isDetail' : '']">
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="签名编号" prop="signNo">
             <el-input v-model.trim="ruleForm.signNo" placeholder="系统自动生成" disabled />
@@ -189,12 +189,17 @@
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
+      </el-form-item> -->
+      <el-form-item label="签名人员" prop="userIdList">
+        <el-select v-model="ruleForm.userIdList" filterable :placeholder="title === '详情' ? '暂无签名人员' : '请选择签名人员'" :disabled="title === '详情'" style="width: 100%;">
+          <el-option v-for="(item) in userList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
       </el-form-item>
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
       <el-form-item label="签名图片" prop="minioFileName">
-        <show-photo :minio-file-name="ruleForm.minioFileName" />
+        <show-photo :minio-file-name="ruleForm.minioFileName" width="100%" height="125px" />
         <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px', 'margin-top': ruleForm.minioFileName === '' ? '0px' : '56px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换图片' }}
         </el-button>
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index 0fdec28..e56f293 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,18 +24,19 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
-const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
-} // 获取可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
+// const getuser = () => {
+//   getUserList({ offset: 1, limit: 99999 }).then((res) => {
+//     userList.value = res.data.rows
+//   })
+// }
+// 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
   title.value = row.title as string
@@ -44,7 +45,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,16 +62,16 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
     templatePageDetail({ ...row }).then((res) => {
       ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
+      // res.data.userList.forEach((element: userType) => {
+      //   ruleForm.userIdList?.push(element.id)
+      // })
     })
     // 修改
   }
@@ -81,14 +82,14 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -184,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index d5d28d8..cf7dec3 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -12,7 +12,7 @@
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = reactive<templateType>({
-  userIdList: [], // 可使用人列表
+  // userIdList: [], // 可使用人列表
   templateType: '', // 类型
   templateName: '', // 名称
   templateCreator: '', // 负责人
@@ -24,17 +24,17 @@
 }) // 表单
 const title = ref('')
 const rules = ref<FormRules>({
-  userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
+  // userIdList: [{ required: true, message: '可使用人列表不能为空', trigger: 'blur' }],
   templateName: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
   templateCreator: [{ required: true, message: '模板负责人不能为空', trigger: 'blur' }],
   minioFileName: [{ required: true, message: '上传附件不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const dialogVisible = ref<boolean>(false) // 弹窗显示
-const userList = ref<userType[]>([]) // 可使用人列表
+// const userList = ref<userType[]>([]) // 可使用人列表
 const getuser = () => {
-  getUserList({ offset: 1, limit: 99999 }).then((res) => {
-    userList.value = res.data.rows
-  })
+  // getUserList({ offset: 1, limit: 99999 }).then((res) => {
+  //   userList.value = res.data.rows
+  // })
 } // 获取可使用人列表
 // 弹窗初始化
 const initDialog = (row: templateType) => {
@@ -44,7 +44,7 @@
   ruleForm.createTime = ''
   ruleForm.templateDesc = ''
   ruleForm.minioFileName = ''
-  ruleForm.userIdList = []
+  // ruleForm.userIdList = []
   ruleForm.templateCreator = ''
   dialogVisible.value = true
   // ruleForm.noticePublisher = userInfo.$state.name
@@ -61,17 +61,17 @@
     // ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     ruleForm.id = row.id
     ruleForm.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
     // 修改
   }
   else {
@@ -81,15 +81,15 @@
     ruleForm.createTime = row.createTime
     ruleForm.templateDesc = row.templateDesc
     ruleForm.minioFileName = row.minioFileName
-    ruleForm.userIdList = row.userIdList
+    // ruleForm.userIdList = row.userIdList
     ruleForm.templateCreator = row.templateCreator
     // 获取详情列表
-    templatePageDetail({ ...row }).then((res) => {
-      // ruleForm.id = res.data.id
-      res.data.userList.forEach((element: userType) => {
-        ruleForm.userIdList?.push(element.id)
-      })
-    })
+    // templatePageDetail({ ...row }).then((res) => {
+    //   ruleForm.id = res.data.id
+    //   res.data.userList.forEach((element: userType) => {
+    //     ruleForm.userIdList?.push(element.id)
+    //   })
+    // })
   }
   ruleForm.templateType = row.templateType
   getuser()
@@ -185,11 +185,11 @@
       <el-form-item label="模板描述" prop="templateDesc">
         <el-input v-model.trim="ruleForm.templateDesc" placeholder="模板描述" :disabled="title === '详情'" />
       </el-form-item>
-      <el-form-item label="可使用人" prop="userIdList">
+      <!-- <el-form-item label="可使用人" prop="userIdList">
         <el-select v-model="ruleForm.userIdList" :placeholder="title === '详情' ? '暂无可使用人' : '请选择可使用人'" multiple :disabled="title === '详情'" style="width: 100%;">
           <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="发布内容" prop="noticeContent">
         <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" />
       </el-form-item> -->